OpenJDK / jdk / jdk

changeset 57854:e4fc1e578b3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8236997: tools/javac tests fail with --illegal-access=deny Summary: Correctly exporting packages to tests. Reviewed-by: jlahoda Contributed-by: adam.sotona@oracle.com
author jlahoda
date Tue, 28 Jan 2020 09:13:27 +0100
parents 7ba7efd42734
children 369e969a0610
files test/jdk/java/lang/reflect/Proxy/ProxyGeneratorCombo.java test/langtools/tools/javac/DefiniteAssignment/T8204610.java test/langtools/tools/javac/T7093325.java test/langtools/tools/javac/T8222949/TestConstantDynamic.java test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java test/langtools/tools/javac/classwriter/ExtraAttributes.java test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java test/langtools/tools/javac/failover/CheckAttributedTree.java test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java test/langtools/tools/javac/lambda/LambdaParserTest.java test/langtools/tools/javac/lambda/MethodReferenceParserTest.java test/langtools/tools/javac/lambda/TestInvokeDynamic.java test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java test/langtools/tools/javac/lambda/deduplication/ClassFieldDeduplication.java test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java test/langtools/tools/javac/lib/combo/ComboInstance.java test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java test/langtools/tools/javac/plugin/InternalAPI.java test/langtools/tools/javac/resolve/BitWiseOperators.java test/langtools/tools/javac/varargs/7042566/T7042566.java test/langtools/tools/javac/varargs/warning/Warn4.java test/langtools/tools/javac/varargs/warning/Warn5.java
diffstat 28 files changed, 31 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/java/lang/reflect/Proxy/ProxyGeneratorCombo.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyGeneratorCombo.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,6 +28,7 @@
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
  *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.compiler/com.sun.tools.javac.tree
  *          jdk.compiler/com.sun.tools.javac.util
--- a/test/langtools/tools/javac/DefiniteAssignment/T8204610.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/DefiniteAssignment/T8204610.java	Tue Jan 28 09:13:27 2020 +0100
@@ -27,10 +27,7 @@
  * @summary Compiler confused by parenthesized "this" in final fields assignments
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
 
--- a/test/langtools/tools/javac/T7093325.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/T7093325.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  * @library /tools/javac/lib
  * @modules jdk.jdeps/com.sun.tools.classfile
  *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main T7093325
--- a/test/langtools/tools/javac/T8222949/TestConstantDynamic.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/T8222949/TestConstantDynamic.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,8 +29,7 @@
  * @modules jdk.jdeps/com.sun.tools.classfile
  *          jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.jvm
  *          jdk.compiler/com.sun.tools.javac.tree
  *          jdk.compiler/com.sun.tools.javac.util
--- a/test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
 
--- a/test/langtools/tools/javac/classwriter/ExtraAttributes.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/classwriter/ExtraAttributes.java	Tue Jan 28 09:13:27 2020 +0100
@@ -86,7 +86,7 @@
 
         List<String> stdout = new toolbox.JavacTask(tb)
                 .classpath(pluginJar)
-                .options("-Xplugin:ExtraAttributes")
+                .options("-XDaccessInternalAPI")
                 .outdir(Files.createDirectories(Path.of("classes")))
                 .files(tb.findJavaFiles(src))
                 .run()
--- a/test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *          Smoke test for static interface method hiding
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main InterfaceMethodHidingTest
--- a/test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main TestDefaultSuperCall
--- a/test/langtools/tools/javac/failover/CheckAttributedTree.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/failover/CheckAttributedTree.java	Tue Jan 28 09:13:27 2020 +0100
@@ -30,8 +30,7 @@
  * @modules java.desktop
  *          jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.tree
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
--- a/test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @compile -Xlint:all DiamondAndInnerClassTest.java
--- a/test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java	Tue Jan 28 09:13:27 2020 +0100
@@ -35,10 +35,7 @@
  * @summary Missing check against target-type during applicability inference
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  *
--- a/test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main GenericOverrideTest
--- a/test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main FunctionalInterfaceConversionTest
--- a/test/langtools/tools/javac/lambda/LambdaParserTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/LambdaParserTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
 
--- a/test/langtools/tools/javac/lambda/MethodReferenceParserTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/MethodReferenceParserTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main MethodReferenceParserTest
--- a/test/langtools/tools/javac/lambda/TestInvokeDynamic.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java	Tue Jan 28 09:13:27 2020 +0100
@@ -31,8 +31,7 @@
  * @modules jdk.jdeps/com.sun.tools.classfile
  *          jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.jvm
  *          jdk.compiler/com.sun.tools.javac.tree
  *          jdk.compiler/com.sun.tools.javac.util
--- a/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java	Tue Jan 28 09:13:27 2020 +0100
@@ -27,10 +27,7 @@
  * @summary Add stat support to LambdaToMethod
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main TestLambdaToMethodStats
--- a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  * @library /tools/javac/lib
  * @modules jdk.jdeps/com.sun.tools.classfile
  *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main TestLambdaBytecode
--- a/test/langtools/tools/javac/lambda/deduplication/ClassFieldDeduplication.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/deduplication/ClassFieldDeduplication.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,6 +28,7 @@
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.tree
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
--- a/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
 
--- a/test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -30,10 +30,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @compile  TypeInferenceComboTest.java
--- a/test/langtools/tools/javac/lib/combo/ComboInstance.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/lib/combo/ComboInstance.java	Tue Jan 28 09:13:27 2020 +0100
@@ -23,10 +23,11 @@
 
 package combo;
 
-import java.lang.reflect.Method;
 import javax.tools.StandardJavaFileManager;
 import java.util.Optional;
 
+import com.sun.tools.javac.file.BaseFileManager;
+
 /**
  * This class is the common superclass of all combo test instances. It defines few helper methods
  * to build compilation tasks using the shared context object, as well as entry points for
@@ -58,14 +59,7 @@
             env.info().lastError = Optional.of(ex);
         } finally {
             this.env = null;
-            try {
-                Class<?> fmClass = env.fileManager().getClass();
-                Method clear = fmClass.getMethod("clear");
-                clear.setAccessible(true);
-                clear.invoke(env.fileManager());
-            } catch (Exception ex) {
-                throw new IllegalStateException(ex);
-            }
+            ((BaseFileManager) env.fileManager()).clear();
         }
     }
 
--- a/test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main DisjunctiveTypeWellFormednessTest
--- a/test/langtools/tools/javac/plugin/InternalAPI.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/plugin/InternalAPI.java	Tue Jan 28 09:13:27 2020 +0100
@@ -27,6 +27,7 @@
  *  @summary Extend support for -XDaccessInternalAPI to plugin modules
  *  @library /tools/lib
  *  @modules jdk.compiler/com.sun.tools.javac.api
+ *           jdk.compiler/com.sun.tools.javac.code
  *           jdk.compiler/com.sun.tools.javac.main
  *           jdk.jlink
  *  @build toolbox.ToolBox toolbox.JavacTask toolbox.JarTask
@@ -127,10 +128,10 @@
         runTests(m -> new Object[] { Path.of(m.getName()) });
     }
 
-    // -XDaccessInternalAPI has always been supported for classpath plugins
     @Test
     public void testClassPath(Path base) throws Exception {
         List<String> stdout = new JavacTask(tb)
+                .options("-XDaccessInternalAPI")
                 .classpath(pluginJar)
                 .outdir(Files.createDirectories(base.resolve("out")))
                 .files(tb.findJavaFiles(Path.of("hw")))
--- a/test/langtools/tools/javac/resolve/BitWiseOperators.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/resolve/BitWiseOperators.java	Tue Jan 28 09:13:27 2020 +0100
@@ -27,10 +27,7 @@
  * @summary Verify that bitwise operators don't allow to mix numeric and boolean operands.
  * @library ../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main BitWiseOperators
--- a/test/langtools/tools/javac/varargs/7042566/T7042566.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/varargs/7042566/T7042566.java	Tue Jan 28 09:13:27 2020 +0100
@@ -29,10 +29,7 @@
  * @library /tools/javac/lib
  * @modules jdk.jdeps/com.sun.tools.classfile
  *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main T7042566
--- a/test/langtools/tools/javac/varargs/warning/Warn4.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/varargs/warning/Warn4.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main Warn4
--- a/test/langtools/tools/javac/varargs/warning/Warn5.java	Mon Jan 27 17:03:08 2020 +0100
+++ b/test/langtools/tools/javac/varargs/warning/Warn5.java	Tue Jan 28 09:13:27 2020 +0100
@@ -28,10 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.util
  * @build combo.ComboTestHelper
  * @run main/othervm Warn5
© 2007, Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks