8228571: [TESTBUG] Fix tests failing on non-aot platforms after JDK-8227512
authorclanger
Fri, 26 Jul 2019 09:06:03 +0200
changeset 57540 dd6d424909dc
parent 57539 e95f52891ce5
child 57541 5da01706bf11
8228571: [TESTBUG] Fix tests failing on non-aot platforms after JDK-8227512 Reviewed-by: iignatyev, jjg
test/langtools/ProblemList-graal.txt
test/langtools/tools/javac/file/LimitedImage.java
test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/ProblemList-graal.txt	Fri Jul 26 09:06:03 2019 +0200
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing in Graal JIT mode.
+#
+#############################################################################
+
+tools/javac/file/LimitedImage.java                         8228642     generic-all
+tools/javac/modules/InheritRuntimeEnvironmentTest.java     8228642     generic-all
--- a/test/langtools/tools/javac/file/LimitedImage.java	Thu Jul 25 21:51:13 2019 +0000
+++ b/test/langtools/tools/javac/file/LimitedImage.java	Fri Jul 26 09:06:03 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
- * @run main/othervm --limit-modules jdk.compiler,jdk.internal.vm.compiler LimitedImage
+ * @run main/othervm --limit-modules jdk.compiler LimitedImage
  */
 
 import java.io.IOException;
--- a/test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java	Thu Jul 25 21:51:13 2019 +0000
+++ b/test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java	Fri Jul 26 09:06:03 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,8 +130,7 @@
         // This is the test, to verify that the module being compiled will not be able to read
         // modules on the module path when a --limit-modules is used
         new TestCase(base)
-                .testOpts("--module-path", modules.toString(),
-                        "--limit-modules", "jdk.compiler,jdk.internal.vm.compiler")
+                .testOpts("--module-path", modules.toString(), "--limit-modules", "jdk.compiler")
                 .otherOpts("-XDrawDiagnostics",
                         "--module-source-path", src.toString(),
                         "-classpath", emptyClassPath.toString())