1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8174692: New MultiReleaseJarTest.java tests fail in JDK 10

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Andrey Nazarov 2017-07-14 14:43:04 +01:00
parent 40accfdf57
commit 02fb43b677
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/test/ProblemList.txt
View File

@ -264,9 +264,6 @@ tools/jimage/JImageExtractTest.java 8170120 generic-
tools/jimage/JImageListTest.java 8170120 generic-all tools/jimage/JImageListTest.java 8170120 generic-all
tools/jimage/JImageVerifyTest.java 8170120 generic-all tools/jimage/JImageVerifyTest.java 8170120 generic-all
tools/schemagen/MultiReleaseJarTest.java 8174692 generic-all
tools/wsgen/MultiReleaseJarTest.java 8174692 generic-all
############################################################################ ############################################################################
# jdk_jdi # jdk_jdi

2
jdk/test/tools/schemagen/MultiReleaseJarTest.java
View File

@ -56,7 +56,7 @@ public class MultiReleaseJarTest {
@DataProvider(name = "jarFiles") @DataProvider(name = "jarFiles")
public Object[][] jarFiles() { public Object[][] jarFiles() {
return new Object[][]{{"MV_BOTH.jar", 9}, return new Object[][]{{"MV_BOTH.jar", Math.min(10, Runtime.version().major())},
{"MV_ONLY_9.jar", 9}, {"MV_ONLY_9.jar", 9},
{"NON_MV.jar", 8}}; {"NON_MV.jar", 8}};
} }

2
jdk/test/tools/wsgen/MultiReleaseJarTest.java
View File

@ -56,7 +56,7 @@ public class MultiReleaseJarTest {
@DataProvider(name = "jarFiles") @DataProvider(name = "jarFiles")
public Object[][] jarFiles() { public Object[][] jarFiles() {
return new Object[][]{{"MV_BOTH.jar", 9}, return new Object[][]{{"MV_BOTH.jar", Math.min(10, Runtime.version().major())},
{"MV_ONLY_9.jar", 9}, {"MV_ONLY_9.jar", 9},
{"NON_MV.jar", 8}}; {"NON_MV.jar", 8}};
} }