commit 02fb43b6775ff7b81334f3b943b5130d67625869
author Andrey Nazarov <anazarov@openjdk.org> Fri Jul 14 14:43:04 2017 +0100
committer Andrey Nazarov <anazarov@openjdk.org> Fri Jul 14 14:43:04 2017 +0100
tree a06a688f86b148bf011a77f9859c29aaf99c1f8e
parent 40accfdf5784d1875a329aea108f3f9bee275dd3

8174692: New MultiReleaseJarTest.java tests fail in JDK 10

Reviewed-by: alanb

jdk/test/ProblemList.txt

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index e063fe7..71389e0 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -264,9 +264,6 @@
 tools/jimage/JImageListTest.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/test/tools/schemagen/MultiReleaseJarTest.java

diff --git a/jdk/test/tools/schemagen/MultiReleaseJarTest.java b/jdk/test/tools/schemagen/MultiReleaseJarTest.java
index 26aa230..659d057 100644
--- a/jdk/test/tools/schemagen/MultiReleaseJarTest.java
+++ b/jdk/test/tools/schemagen/MultiReleaseJarTest.java
@@ -56,7 +56,7 @@
 
     @DataProvider(name = "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},
                 {"NON_MV.jar", 8}};
     }

jdk/test/tools/wsgen/MultiReleaseJarTest.java

diff --git a/jdk/test/tools/wsgen/MultiReleaseJarTest.java b/jdk/test/tools/wsgen/MultiReleaseJarTest.java
index c695341..a0d3ec0 100644
--- a/jdk/test/tools/wsgen/MultiReleaseJarTest.java
+++ b/jdk/test/tools/wsgen/MultiReleaseJarTest.java
@@ -56,7 +56,7 @@
 
     @DataProvider(name = "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},
                 {"NON_MV.jar", 8}};
     }