From 02fb43b6775ff7b81334f3b943b5130d67625869 Mon Sep 17 00:00:00 2001 From: Andrey Nazarov Date: Fri, 14 Jul 2017 14:43:04 +0100 Subject: [PATCH] 8174692: New MultiReleaseJarTest.java tests fail in JDK 10 Reviewed-by: alanb --- jdk/test/ProblemList.txt | 3 --- jdk/test/tools/schemagen/MultiReleaseJarTest.java | 2 +- jdk/test/tools/wsgen/MultiReleaseJarTest.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index e063fe759ea..71389e0fd1a 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -264,9 +264,6 @@ tools/jimage/JImageExtractTest.java 8170120 generic- 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 diff --git a/jdk/test/tools/schemagen/MultiReleaseJarTest.java b/jdk/test/tools/schemagen/MultiReleaseJarTest.java index 26aa230680a..659d057d4e0 100644 --- a/jdk/test/tools/schemagen/MultiReleaseJarTest.java +++ b/jdk/test/tools/schemagen/MultiReleaseJarTest.java @@ -56,7 +56,7 @@ public class MultiReleaseJarTest { @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}}; } diff --git a/jdk/test/tools/wsgen/MultiReleaseJarTest.java b/jdk/test/tools/wsgen/MultiReleaseJarTest.java index c6953416d9b..a0d3ec02900 100644 --- a/jdk/test/tools/wsgen/MultiReleaseJarTest.java +++ b/jdk/test/tools/wsgen/MultiReleaseJarTest.java @@ -56,7 +56,7 @@ public class MultiReleaseJarTest { @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}}; }