8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests

Reviewed-by: alanb

jdk/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java

@@ -26,8 +26,10 @@
  * @bug 7130985
  * @summary Four helper classes missing in Sun JDK
  * @library /lib/testlibrary /test/lib
- * @build jdk.testlibrary.*
  * @modules java.corba
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
+ *        jdk.testlibrary.*
  * @run main CorbaExceptionsCompileTest
  */
 

jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java

@@ -25,6 +25,8 @@
  * @test
  * @bug 8048604
  * @library ../ /test/lib
+ * @build jdk.test.lib.RandomFactory
+ * @run main CipherNCFuncTest
  * @summary This test verifies the assertion "There should be no transformation
  *          on the plaintext/ciphertext in encryption/decryption mechanism" for
  *          feature "NullCipher".

jdk/test/java/io/FilePermission/FilePermissionCollectionMerge.java

@@ -28,6 +28,8 @@
  * @summary FilePermissionCollection merges incorrectly
  * @modules java.base/sun.security.util
  * @library /test/lib
+ * @build jdk.test.lib.Asserts
+ * @run main FilePermissionCollectionMerge
  */
 
 import sun.security.util.FilePermCompat;

jdk/test/java/io/FilePermission/Invalid.java

@@ -27,6 +27,8 @@
  * @bug 8167646
  * @summary Better invalid FilePermission
  * @library /test/lib
+ * @build jdk.test.lib.Asserts
+ * @run main Invalid
  */
 
 import jdk.test.lib.Asserts;

jdk/test/java/io/FilePermission/MergeName.java

@@ -37,6 +37,13 @@ import java.util.stream.IntStream;
  * @bug 8170364
  * @summary FilePermission path modified during merge
  * @library /test/lib
+ * @build jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
+ * @run main MergeName
  */
 
 public class MergeName {

jdk/test/java/io/FilePermission/ReadFileOnPath.java

@@ -27,6 +27,13 @@
  * @library /lib/testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.compiler
+ * @build jdk.test.lib.compiler.CompilerUtils
+ *        jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
  * @run main ReadFileOnPath
  * @summary Still able to read file on the same path
  */

jdk/test/java/io/InputStream/ReadAllBytes.java

@@ -33,6 +33,7 @@ import jdk.test.lib.RandomFactory;
  * @test
  * @bug 8080835
  * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
  * @run main ReadAllBytes
  * @summary Basic test for InputStream.readAllBytes
  * @key randomness

jdk/test/java/io/InputStream/ReadNBytes.java

@@ -33,6 +33,7 @@ import jdk.test.lib.RandomFactory;
  * @test
  * @bug 8080835
  * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
  * @run main ReadNBytes
  * @summary Basic test for InputStream.readNBytes
  * @key randomness

jdk/test/java/io/Serializable/class/NonSerializableTest.java

@@ -25,8 +25,13 @@
  * @test
  * @bug 4075221
  * @library /test/lib
- * @build jdk.test.lib.compiler.*
- * @build jdk.test.lib.process.*
+ * @build jdk.test.lib.compiler.CompilerUtils
+ *        jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
  * @run testng/timeout=300 NonSerializableTest
  * @summary Enable serialize of nonSerializable Class descriptor.
  */

jdk/test/java/io/Serializable/evolution/RenamePackage/RenamePackageTest.java

@@ -26,7 +26,12 @@
  * @bug 4087295 4785472
  * @library /test/lib
  * @build jdk.test.lib.compiler.CompilerUtils
- * @build jdk.test.lib.process.ProcessTools
+ *        jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
  * @build RenamePackageTest
  * @run main RenamePackageTest
  * @summary Enable resolveClass() to accommodate package renaming.

jdk/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java

@@ -27,6 +27,8 @@
  * @summary Better failure atomicity for default read object.
  * @modules jdk.compiler
  * @library /test/lib
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
  * @compile FailureAtomicity.java SerialRef.java
  * @run main failureAtomicity.FailureAtomicity
  */

jdk/test/java/io/Serializable/serialver/classpath/ClasspathTest.java

@@ -25,8 +25,12 @@
  * @test
  * @bug 4035147 4785472
  * @library /test/lib
+ * @build jdk.test.lib.Utils
+ * @build jdk.test.lib.Asserts
+ * @build jdk.test.lib.JDKToolFinder
  * @build jdk.test.lib.JDKToolLauncher
- * @build jdk.test.lib.process.ProcessTools
+ * @build jdk.test.lib.Platform
+ * @build jdk.test.lib.process.*
  * @build ClasspathTest
  * @run main serialver.ClasspathTest
  * @summary Test the use of the -classpath switch in the serialver application.

jdk/test/java/io/Serializable/serialver/nested/NestedTest.java

@@ -25,8 +25,12 @@
  * @test
  * @bug 4312217 4785473
  * @library /test/lib
- * @build jdk.test.lib.JDKToolLauncher
- * @build jdk.test.lib.process.ProcessTools
+ * @build jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
  * @build NestedTest
  * @run main serialver.NestedTest
  * @summary  To test the use of nested class specification using the '.'

jdk/test/java/net/Inet6Address/B6206527.java

@@ -26,6 +26,8 @@
  * @bug 6206527
  * @summary "cannot assign address" when binding ServerSocket on Suse 9
  * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
  * @run main B6206527
  */
 

jdk/test/java/net/Inet6Address/B6558853.java

@@ -26,6 +26,8 @@
  * @bug 6558853
  * @summary  getHostAddress() on connections using IPv6 link-local addrs should have zone id
  * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
  * @run main B6558853
  */
 

jdk/test/java/net/InetAddress/CheckJNI.java

@@ -25,6 +25,8 @@
  * @bug 4889870 4890033
  * @summary java -Xcheck:jni failing in net code on Solaris / [Datagram]Socket.getLocalAddress() failure
  * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
  * @run main/othervm -Xcheck:jni CheckJNI
  */
 

jdk/test/java/net/InetAddress/ptr/Lookup.java

@@ -28,8 +28,12 @@
  * @summary Test that reverse lookups of IPv4 addresses work when IPv6
  *          is enabled
  * @library /test/lib
- * @build jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.process.OutputAnalyzer
+ * @build jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
  *        Lookup
  * @run main Lookup root
  *

jdk/test/java/net/MulticastSocket/JoinLeave.java

@@ -26,6 +26,8 @@
  * @bug 4091811 4148753 4102731
  * @summary Test java.net.MulticastSocket joinGroup and leaveGroup
  * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
  * @run main JoinLeave
  */
 

jdk/test/java/net/MulticastSocket/SetLoopbackMode.java

@@ -26,6 +26,8 @@
  * @bug 4686717
  * @summary Test MulticastSocket.setLoopbackMode
  * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
  * @run main/othervm SetLoopbackMode
  */
 

jdk/test/java/net/NetworkConfigurationProbe.java

@@ -25,6 +25,13 @@
  * @test
  * @summary NOT A TEST. Captures the network interface configuration.
  * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
  * @run main NetworkConfigurationProbe
  */