Update security properties for java_net for jdk 11+ #4085
Merged
+23
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Test with x64 Linux with
|
andrew-m-leonard
requested changes
Oct 25, 2022
llxia
reviewed
Oct 25, 2022
jck/jtrunner/JavaTestRunner.java
Outdated
| @@ -1220,7 +1243,7 @@ private static boolean testsRequireDisplay (String tests) { | |||
| private static String getTestSpecificJvmOptions(String jckVersion, String tests) { | |||
| String testSpecificJvmOptions = ""; | |||
|
|
|||
| if ( tests.contains("api/javax_net") || tests.contains("api/javax_xml") || (getJckVersionInt(jckVersionNo) >= 18 && (tests.contains("api/java_net") || tests.contains("api/java_util"))) ) { | |||
| if ( tests.contains("api/javax_net") || tests.contains("api/javax_xml") || tests.contains("api/java_net") || tests.contains("api/java_util") ) { | |||
There was a problem hiding this comment.
By removing getJckVersionInt(jckVersionNo) >= 18, we will set extra security.properties for all version. I thought we only want to set for JDK11+.
There was a problem hiding this comment.
Thanks @llxia ! Yes, I've added the version check back, and changed the value to 11+.
Mesbah-Alam
force-pushed
the
fix-Java_net-zos
branch
3 times, most recently
from
fb31f4b to
79fdd25
Compare
Signed-off-by: Mesbah Alam <Mesbah_Alam@ca.ibm.com>
Mesbah-Alam
force-pushed
the
fix-Java_net-zos
branch
from
79fdd25 to
29dc614
Compare
|
This PR has been updated to include changes in #4059. Grinder links have been updated with latest tests. Please review. |
andrew-m-leonard
approved these changes
Oct 26, 2022
|
Both Grinder_JCK/748 and Grinder_JCK/750 ran against JDK19. Please provide the Grinder link for JDK11. Thanks |
|
Re: #4085 (comment) - ah, too many grinder runs causing mix up! Here's a fresh run on 11: Grinder_JCK/755. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FYI @JasonFengJ9
Signed-off-by: Mesbah Alam Mesbah_Alam@ca.ibm.com