openjdk · RogerRiggs · Oct 15, 2024 · Oct 18, 2024
diff --git a/test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java b/test/jdk/java/lang/ClassLoader/securityManager/ClassLoaderTest.java
@@ -30,7 +30,6 @@
  * @modules java.base/jdk.internal.module
  * @library /test/lib
  * @build jdk.test.lib.util.JarUtils
- * jdk.test.lib.util.ModuleInfoWriter
  * @build TestClassLoader TestClient
  * @run main ClassLoaderTest -noPolicy
  * @run main ClassLoaderTest -validPolicy

diff --git a/test/jdk/java/lang/ModuleTests/AnnotationsTest.java b/test/jdk/java/lang/ModuleTests/AnnotationsTest.java
@@ -52,7 +52,6 @@
  * @enablePreview
  * @modules java.base/jdk.internal.module
  * @library /test/lib
- * @build jdk.test.lib.util.ModuleInfoWriter
  * @run testng AnnotationsTest
  * @summary Basic test of annotations on modules
  */

diff --git a/test/jdk/java/lang/instrument/RetransformApp.java b/test/jdk/java/lang/instrument/RetransformApp.java
@@ -36,6 +36,7 @@
  *
  * @modules java.instrument
  * @library /test/lib
+ * @build jdk.test.lib.process.ProcessTools
  * @build RetransformAgent asmlib.Instrumentor
  * @enablePreview
  * @comment The test uses asmlib/Instrumentor.java which relies on ClassFile API PreviewFeature.

diff --git a/test/jdk/java/lang/invoke/common/LIBRARY.properties b/test/jdk/java/lang/invoke/common/LIBRARY.properties
@@ -0,0 +1 @@
+enablePreview = true
diff --git a/test/jdk/java/lang/module/ClassFileVersionsTest.java b/test/jdk/java/lang/module/ClassFileVersionsTest.java
@@ -26,7 +26,6 @@
  * @enablePreview
  * @modules java.base/jdk.internal.module
  * @library /test/lib
- * @build jdk.test.lib.util.ModuleInfoWriter
  * @run testng ClassFileVersionsTest
  * @summary Test parsing of module-info.class with different class file versions
  */

diff --git a/test/jdk/java/lang/module/ConfigurationTest.java b/test/jdk/java/lang/module/ConfigurationTest.java
@@ -28,7 +28,6 @@
  * java.base/jdk.internal.module
  * @library /test/lib
  * @build ConfigurationTest
- * jdk.test.lib.util.ModuleInfoWriter
  * jdk.test.lib.util.ModuleUtils
  * @run testng ConfigurationTest
  * @summary Basic tests for java.lang.module.Configuration

diff --git a/test/jdk/java/lang/module/ModuleDescriptorTest.java b/test/jdk/java/lang/module/ModuleDescriptorTest.java
@@ -28,7 +28,6 @@
  * @modules java.base/jdk.internal.access
  * java.base/jdk.internal.module
  * @library /test/lib
- * @build jdk.test.lib.util.ModuleInfoWriter
  * @run testng ModuleDescriptorTest
  * @summary Basic test for java.lang.module.ModuleDescriptor and its builder
  */

diff --git a/test/jdk/java/lang/module/ModuleFinderTest.java b/test/jdk/java/lang/module/ModuleFinderTest.java
@@ -26,7 +26,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.module
  * @library /test/lib
- * @build ModuleFinderTest jdk.test.lib.util.ModuleInfoWriter
+ * @build ModuleFinderTest
  * @run testng ModuleFinderTest
  * @summary Basic tests for java.lang.module.ModuleFinder
  */
@@ -827,4 +827,3 @@ static Path createModularJar(Path file, String mid, String ... entries)
  }
 
 }
-
diff --git a/test/jdk/java/lang/module/ModuleNamesTest.java b/test/jdk/java/lang/module/ModuleNamesTest.java
@@ -27,7 +27,6 @@
  * @modules java.base/jdk.internal.access
  * java.base/jdk.internal.module
  * @library /test/lib
- * @build jdk.test.lib.util.ModuleInfoWriter
  * @run testng ModuleNamesTest
  * @summary Basic test of reading a module-info.class with module names that
  * are legal in class files but not legal in the Java Language

diff --git a/test/jdk/java/lang/module/MultiReleaseJarTest.java b/test/jdk/java/lang/module/MultiReleaseJarTest.java
@@ -28,7 +28,6 @@
  * @library /test/lib
  * @build MultiReleaseJarTest
  * jdk.test.lib.util.JarUtils
- * jdk.test.lib.util.ModuleInfoWriter
  * @run testng MultiReleaseJarTest
  * @run testng/othervm -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarTest
  * @summary Basic test of modular JARs as multi-release JARs

diff --git a/test/jdk/java/security/Provider/SecurityProviderModularTest.java b/test/jdk/java/security/Provider/SecurityProviderModularTest.java
@@ -51,7 +51,6 @@
  * @modules java.base/jdk.internal.module
  * @library /test/lib
  * @build jdk.test.lib.util.JarUtils
- * jdk.test.lib.util.ModuleInfoWriter
  * TestProvider TestClient
  * @run main SecurityProviderModularTest CL true
  * @run main SecurityProviderModularTest CL false

diff --git a/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularClientTest.java
@@ -46,7 +46,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.module
  * @library /test/lib
- * @build jdk.test.lib.util.JarUtils jdk.test.lib.util.ModuleInfoWriter
+ * @build jdk.test.lib.util.JarUtils
  * @build TestLoginModule JaasClient
  * @run main JaasModularClientTest false
  * @run main JaasModularClientTest true

diff --git a/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java b/test/jdk/javax/security/auth/login/modules/JaasModularDefaultHandlerTest.java
@@ -45,7 +45,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.module
  * @library /test/lib
- * @build jdk.test.lib.util.JarUtils jdk.test.lib.util.ModuleInfoWriter
+ * @build jdk.test.lib.util.JarUtils
  * @build TestCallbackHandler TestLoginModule JaasClientWithDefaultHandler
  * @run main JaasModularDefaultHandlerTest
  */

diff --git a/test/jdk/jdk/modules/incubator/ServiceBinding.java b/test/jdk/jdk/modules/incubator/ServiceBinding.java
@@ -27,7 +27,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.module
  * @library /test/lib
- * @build ServiceBinding TestBootLayer jdk.test.lib.util.ModuleInfoWriter
+ * @build ServiceBinding TestBootLayer
  * @run testng ServiceBinding
  * @summary Test service binding with incubator modules
  */

diff --git a/test/jdk/sun/tools/jcmd/TestProcessHelper.java b/test/jdk/sun/tools/jcmd/TestProcessHelper.java
@@ -60,7 +60,6 @@
  * @library /test/lib
  * @build test.TestProcess
  * jdk.test.lib.util.JarUtils
- * jdk.test.lib.util.ModuleInfoWriter
  * @run main/othervm TestProcessHelper
  */
 public class TestProcessHelper {

diff --git a/test/jdk/tools/jlink/JLinkNegativeTest.java b/test/jdk/tools/jlink/JLinkNegativeTest.java
@@ -36,7 +36,7 @@
  * jdk.jlink/jdk.tools.jimage
  * jdk.compiler
  * @library /test/lib ../lib
- * @build tests.* jdk.test.lib.util.ModuleInfoWriter
+ * @build tests.*
  * @run testng JLinkNegativeTest
  */
 

diff --git a/test/jdk/tools/lib/LIBRARY.properties b/test/jdk/tools/lib/LIBRARY.properties
@@ -0,0 +1 @@
+enablePreview = true
diff --git a/test/langtools/lib/annotations/LIBRARY.properties b/test/langtools/lib/annotations/LIBRARY.properties
@@ -0,0 +1 @@
+enablePreview = true
diff --git a/.../langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java b/.../langtools/tools/javac/annotations/typeAnnotations/classfile/NestedLambdasCastedTest.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8144168 8148432
  * @summary No type annotations generated for nested lambdas
+ * @enablePreview
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  * jdk.compiler/com.sun.tools.javac.main

diff --git a/test/langtools/tools/javac/classfiles/attributes/lib/LIBRARY.properties b/test/langtools/tools/javac/classfiles/attributes/lib/LIBRARY.properties
@@ -0,0 +1 @@
+enablePreview = true
diff --git a/test/langtools/tools/javac/completionDeps/DepsAndAnno.java b/test/langtools/tools/javac/completionDeps/DepsAndAnno.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8078600
  * @summary Make sure -XDcompletionDeps does not cause an infinite loop.
+ * @enablePreview
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  * jdk.compiler/com.sun.tools.javac.main

diff --git a/test/langtools/tools/javac/lib/LIBRARY.properties b/test/langtools/tools/javac/lib/LIBRARY.properties
@@ -0,0 +1 @@
+enablePreview = false
diff --git a/test/langtools/tools/javac/processing/OverwriteInitialInput.java b/test/langtools/tools/javac/processing/OverwriteInitialInput.java
@@ -26,6 +26,7 @@
  * @bug 8067747
  * @summary Verify the correct Filer behavior w.r.t. initial inputs
  * (should throw FilerException when overwriting initial inputs).
+ * @enablePreview
  * @library /tools/lib /tools/javac/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  * jdk.compiler/com.sun.tools.javac.main

diff --git a/test/langtools/tools/javac/processing/rounds/GenerateAnonymousClass.java b/test/langtools/tools/javac/processing/rounds/GenerateAnonymousClass.java
@@ -26,6 +26,7 @@
  * @bug 8204630
  * @summary generating an anonymous class with Filer#createClassFile causes an NPE in
  * JavacProcessingEnvironment
+ * @enablePreview
  * @library /tools/lib /tools/javac/lib/
  * @modules jdk.compiler/com.sun.tools.javac.api
  * jdk.compiler/com.sun.tools.javac.main

diff --git a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations.java b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
@@ -26,6 +26,7 @@
  * @bug 8038455
  * @summary Verify that annotation processor can overwrite source and class files it generated
  * during previous compilations, and that the Symbols are updated appropriately.
+ * @enablePreview
  * @library /tools/lib /tools/javac/lib/
  * @modules jdk.compiler/com.sun.tools.javac.api
  * jdk.compiler/com.sun.tools.javac.main

diff --git a/test/lib/LIBRARY.properties b/test/lib/LIBRARY.properties
@@ -0,0 +1 @@
+enablePreview = false # false so the common build is NOT --enable-preview