8227512: [TESTBUG] Fix JTReg javac test failures with Graal
authorpli
Tue, 16 Jul 2019 00:57:00 +0000
changeset 55689 8c5c9d86e1d6
parent 55688 0e1bc587472c
child 55690 a07fedf3db62
8227512: [TESTBUG] Fix JTReg javac test failures with Graal Reviewed-by: mcimadamore
test/langtools/tools/javac/file/LimitedImage.java
test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java
--- a/test/langtools/tools/javac/file/LimitedImage.java	Tue Jul 16 21:12:14 2019 +0000
+++ b/test/langtools/tools/javac/file/LimitedImage.java	Tue Jul 16 00:57:00 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -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 LimitedImage
+ * @run main/othervm --limit-modules jdk.compiler,jdk.internal.vm.compiler LimitedImage
  */
 
 import java.io.IOException;
--- a/test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java	Tue Jul 16 21:12:14 2019 +0000
+++ b/test/langtools/tools/javac/modules/InheritRuntimeEnvironmentTest.java	Tue Jul 16 00:57:00 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -130,7 +130,8 @@
         // 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")
+                .testOpts("--module-path", modules.toString(),
+                        "--limit-modules", "jdk.compiler,jdk.internal.vm.compiler")
                 .otherOpts("-XDrawDiagnostics",
                         "--module-source-path", src.toString(),
                         "-classpath", emptyClassPath.toString())