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

Reviewed-by: alanb
2026-02-10 02:18:46 +00:00 · 2017-06-12 12:43:26 -07:00 · 2017-06-12 12:43:26 -07:00 · f84b521220
commit f84b521220
parent 1d0a99f1c3
118 changed files with 376 additions and 45 deletions
--- a/jdk/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java
+++ b/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
 */

--- a/jdk/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java
+++ b/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".
--- a/jdk/test/java/io/FilePermission/FilePermissionCollectionMerge.java
+++ b/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;
--- a/jdk/test/java/io/FilePermission/Invalid.java
+++ b/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;
--- a/jdk/test/java/io/FilePermission/MergeName.java
+++ b/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 {
--- a/jdk/test/java/io/FilePermission/ReadFileOnPath.java
+++ b/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
 */
--- a/jdk/test/java/io/InputStream/ReadAllBytes.java
+++ b/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
--- a/jdk/test/java/io/InputStream/ReadNBytes.java
+++ b/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
--- a/jdk/test/java/io/Serializable/class/NonSerializableTest.java
+++ b/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.
 */
--- a/jdk/test/java/io/Serializable/evolution/RenamePackage/RenamePackageTest.java
+++ b/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.
--- a/jdk/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java
+++ b/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
 */
--- a/jdk/test/java/io/Serializable/serialver/classpath/ClasspathTest.java
+++ b/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.
--- a/jdk/test/java/io/Serializable/serialver/nested/NestedTest.java
+++ b/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 '.'
--- a/jdk/test/java/net/Inet6Address/B6206527.java
+++ b/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
 */

--- a/jdk/test/java/net/Inet6Address/B6558853.java
+++ b/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
 */

--- a/jdk/test/java/net/InetAddress/CheckJNI.java
+++ b/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
 */

--- a/jdk/test/java/net/InetAddress/ptr/Lookup.java
+++ b/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
 *
--- a/jdk/test/java/net/MulticastSocket/JoinLeave.java
+++ b/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
 */

--- a/jdk/test/java/net/MulticastSocket/SetLoopbackMode.java
+++ b/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
 */

--- a/jdk/test/java/net/NetworkConfigurationProbe.java
+++ b/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
 */

--- a/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
+++ b/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
@ -30,8 +30,12 @@
 *          can cause fd leak
 * @requires (os.family != "windows")
 * @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.*
 *        AcceptCauseFileDescriptorLeak
 * @run main/othervm AcceptCauseFileDescriptorLeak root
 */
--- a/jdk/test/java/net/Socket/LinkLocal.java
+++ b/jdk/test/java/net/Socket/LinkLocal.java
@ -27,6 +27,8 @@
 * @summary Connecting to a link-local IPv6 address should not
 *          causes a SocketException to be thrown.
 * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
 * @run main LinkLocal
 */

--- a/jdk/test/java/net/Socket/OldSocketImplTestDriver.java
+++ b/jdk/test/java/net/Socket/OldSocketImplTestDriver.java
@ -30,7 +30,12 @@ import java.nio.file.Paths;
 * @test
 * @bug 6449565
 * @library /test/lib
- * @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.*
 * @run main OldSocketImplTestDriver
 * @summary Test driver for OdlSocketImpl
 */
--- a/jdk/test/java/net/SocketPermission/SocketPermissionTest.java
+++ b/jdk/test/java/net/SocketPermission/SocketPermissionTest.java
@ -26,6 +26,8 @@
 * @bug 8047031
 * @summary SocketPermission tests for legacy socket types
 * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
 * @run testng/othervm SocketPermissionTest
 */

--- a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java
+++ b/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java
@ -30,7 +30,10 @@
 * @library ../../../../com/sun/net/httpserver
 *          /lib/testlibrary
 *          /test/lib
- * @build FileServerHandler JarUtils jdk.test.lib.compiler.CompilerUtils
+ * @build jdk.test.lib.compiler.CompilerUtils
+ *        jdk.test.lib.util.FileUtils
+ *        jdk.test.lib.Platform
+ *        FileServerHandler JarUtils
 * @run main/othervm CloseTest
 * @summary URL-downloaded jar files can consume all available file descriptors
 */
--- a/jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java
+++ b/jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java
@ -26,7 +26,10 @@
 * @bug 6899919
 * @library /lib/testlibrary /test/lib
 * @modules jdk.compiler
- * @build JarUtils jdk.test.lib.compiler.CompilerUtils
+ * @build jdk.test.lib.compiler.CompilerUtils
+ *        jdk.test.lib.util.FileUtils
+ *        jdk.test.lib.Platform
+ *        JarUtils
 * @run main/othervm GetResourceAsStream
 */

--- a/jdk/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java
+++ b/jdk/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java
@ -26,8 +26,12 @@
 * @bug 5103449
 * @summary REGRESSION: getResourceAsStream is broken in JDK1.5.0-rc
 * @library /test/lib
- * @build jdk.test.lib.JDKToolFinder
- *        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.*
 *        Test
 * @run main/othervm TestDriver
 */
--- a/jdk/test/java/net/URLClassLoader/sealing/CheckSealedTest.java
+++ b/jdk/test/java/net/URLClassLoader/sealing/CheckSealedTest.java
@ -26,8 +26,12 @@
 * @bug 4244970
 * @summary Test to see if sealing violation is detected correctly
 * @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.*
 * @run main CheckSealedTest
 */

--- a/jdk/test/java/net/URLConnection/6212146/TestDriver.java
+++ b/jdk/test/java/net/URLConnection/6212146/TestDriver.java
@ -27,8 +27,12 @@
 * @summary URLConnection.connect() fails on JAR Entry it creates
 * file handler leak
 * @library /test/lib
- * @build jdk.test.lib.JDKToolFinder
- *        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.*
 *        Test
 * @run main/othervm TestDriver
 */
--- a/jdk/test/java/net/httpclient/RequestBodyTest.java
+++ b/jdk/test/java/net/httpclient/RequestBodyTest.java
@ -29,6 +29,8 @@
 * @library /lib/testlibrary/ /test/lib
 * @compile ../../../com/sun/net/httpserver/LogFilter.java
 * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
+ * @build jdk.test.lib.Platform
+ * @build jdk.test.lib.util.FileUtils
 * @build LightWeightHttpServer
 * @build jdk.testlibrary.SimpleSSLContext
 * @run testng/othervm RequestBodyTest
--- a/jdk/test/java/net/ipv6tests/B6521014.java
+++ b/jdk/test/java/net/ipv6tests/B6521014.java
@ -26,6 +26,8 @@
 * @bug 6521014 6543428
 * @summary IOException thrown when Socket tries to bind to an local IPv6 address on SuSE Linux
 * @library /test/lib
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
 * @run main B6521014
 */

--- a/jdk/test/java/net/spi/URLStreamHandlerProvider/Basic.java
+++ b/jdk/test/java/net/spi/URLStreamHandlerProvider/Basic.java
@ -56,7 +56,9 @@ import static java.util.Arrays.asList;
 * @modules jdk.compiler
 * @summary Basic test for URLStreamHandlerProvider
 * @library /lib/testlibrary /test/lib
- * @build jdk.testlibrary.JDKToolFinder
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
+ *        jdk.testlibrary.JDKToolFinder
 * @compile Basic.java Child.java
 * @run main Basic
 */
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
@ -25,6 +25,7 @@
 * @bug 4607272 6842687 6878369 6944810 7023403
 * @summary Unit test for AsynchronousSocketChannel(use -Dseed=X to set PRNG seed)
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main Basic -skipSlowConnectTest
 * @key randomness intermittent
 */
--- a/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java
@ -25,7 +25,9 @@
 * @bug 4527345
 * @summary Unit test for DatagramChannel's multicast support
 * @library /test/lib
- * @build BasicMulticastTests
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ *        BasicMulticastTests
 * @run main BasicMulticastTests
 */

--- a/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
@ -25,7 +25,9 @@
 * @bug 4527345 7026376 6633549
 * @summary Unit test for DatagramChannel's multicast support
 * @library /test/lib
- * @build MulticastSendReceiveTests
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ *        MulticastSendReceiveTests
 * @run main MulticastSendReceiveTests
 * @run main/othervm -Djava.net.preferIPv4Stack=true MulticastSendReceiveTests
 * @key randomness
--- a/jdk/test/java/nio/channels/DatagramChannel/Promiscuous.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/Promiscuous.java
@ -26,7 +26,9 @@
 * @summary Test for interference when two sockets are bound to the same
 *   port but joined to different multicast groups
 * @library /test/lib
- * @build Promiscuous
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ *        Promiscuous
 * @run main Promiscuous
 * @run main/othervm -Djava.net.preferIPv4Stack=true Promiscuous
 * @key randomness
--- a/jdk/test/java/nio/channels/FileChannel/Transfer.java
+++ b/jdk/test/java/nio/channels/FileChannel/Transfer.java
@ -26,6 +26,7 @@
 * @summary Test FileChannel.transferFrom and transferTo (use -Dseed=X to set PRNG seed)
 * @library ..
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run testng/timeout=300 Transfer
 * @key randomness
 */
--- a/jdk/test/java/nio/channels/Selector/LotsOfUpdatesTest.java
+++ b/jdk/test/java/nio/channels/Selector/LotsOfUpdatesTest.java
@ -28,7 +28,13 @@
 *     Solaris if maximum number of file descriptors is less than 10000
 * @requires (os.family != "windows")
 * @library /test/lib
- * @build LotsOfUpdates
+ * @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.*
+ *        LotsOfUpdates
 * @run main LotsOfUpdatesTest
 */

--- a/jdk/test/java/nio/channels/SocketChannel/VectorIO.java
+++ b/jdk/test/java/nio/channels/SocketChannel/VectorIO.java
@ -24,6 +24,7 @@
 /* @test
 * @summary Test socketchannel vector IO (use -Dseed=X to set PRNG seed)
 * @library .. /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main VectorIO
 * @key randomness
 */
--- a/jdk/test/java/nio/file/FileStore/Basic.java
+++ b/jdk/test/java/nio/file/FileStore/Basic.java
@ -26,6 +26,8 @@
 * @summary Unit test for java.nio.file.FileStore
 * @key intermittent
 * @library .. /test/lib
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
 * @run main Basic
 */

--- a/jdk/test/java/nio/file/FileSystem/Basic.java
+++ b/jdk/test/java/nio/file/FileSystem/Basic.java
@ -25,6 +25,8 @@
 * @bug 4313887 6838333 8132497
 * @summary Unit test for java.nio.file.FileSystem
 * @library .. /test/lib
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
 * @run main/othervm Basic
 */

--- a/jdk/test/java/nio/file/Files/CopyAndMove.java
+++ b/jdk/test/java/nio/file/Files/CopyAndMove.java
@ -25,7 +25,8 @@
 * @bug 4313887 6838333 6917021 7006126 6950237 8006645
 * @summary Unit test for java.nio.file.Files copy and move methods (use -Dseed=X to set PRNG seed)
 * @library .. /test/lib
- * @build CopyAndMove PassThroughFileSystem
+ * @build jdk.test.lib.RandomFactory
+ *        CopyAndMove PassThroughFileSystem
 * @run main/othervm CopyAndMove
 * @key randomness
 */
--- a/jdk/test/java/nio/file/Files/DeleteOnClose.java
+++ b/jdk/test/java/nio/file/Files/DeleteOnClose.java
@ -26,6 +26,13 @@
 * @bug 4313887
 * @summary Unit test for DELETE_ON_CLOSE open option
 * @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 DeleteOnClose
 */

 import java.io.IOException;
--- a/jdk/test/java/nio/file/Files/StreamLinesTest.java
+++ b/jdk/test/java/nio/file/Files/StreamLinesTest.java
@ -25,6 +25,7 @@
 * @bug 8072773
 * @library /test/lib /lib/testlibrary/bootlib
 * @build java.base/java.util.stream.OpTestCase
+ *        jdk.test.lib.RandomFactory
 * @run testng/othervm StreamLinesTest
 * @summary Tests streams returned from Files.lines, primarily focused on
 *          testing the file-channel-based stream stream with supported
--- a/jdk/test/java/nio/file/WatchService/LotsOfEvents.java
+++ b/jdk/test/java/nio/file/WatchService/LotsOfEvents.java
@ -26,6 +26,7 @@
 * @summary Tests WatchService behavior when lots of events are pending (use -Dseed=X to set PRNG seed)
 * @library ..
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main/timeout=180 LotsOfEvents
 * @key randomness
 */
--- a/jdk/test/java/security/AccessController/DoPrivAccompliceTest.java
+++ b/jdk/test/java/security/AccessController/DoPrivAccompliceTest.java
@ -42,7 +42,13 @@ import java.nio.file.Paths;
 * DoPrivAccmplice.jar.
 *
 * @library /test/lib
- *
+ * @build jdk.test.lib.util.JarUtils
+ *        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/othervm DoPrivAccompliceTest
 */

--- a/jdk/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java
+++ b/jdk/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java
@ -42,6 +42,8 @@ import java.util.Arrays;
 * specified by different PBE algorithms (use -Dseed=X to set PRNG seed)
 * @library /test/lib /lib/testlibrary ../
 * @key randomness
+ * @build jdk.test.lib.RandomFactory
+ * @run main EntryProtectionTest
 */
 public class EntryProtectionTest {
    private static final char[] PASSWORD = "passwd".toCharArray();
--- a/jdk/test/java/security/MessageDigest/TestDigestIOStream.java
+++ b/jdk/test/java/security/MessageDigest/TestDigestIOStream.java
@ -41,6 +41,7 @@ import static java.lang.System.out;
 * @author Kevin Liu
 * @key randomness
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main/timeout=180 TestDigestIOStream
 */

--- a/jdk/test/java/security/MessageDigest/TestSameLength.java
+++ b/jdk/test/java/security/MessageDigest/TestSameLength.java
@ -36,6 +36,8 @@ import jdk.test.lib.RandomFactory;
 * @author Kevin Liu
 * @key randomness
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
+ * @run main TestSameLength
 */

 public class TestSameLength {
--- a/jdk/test/java/security/MessageDigest/TestSameValue.java
+++ b/jdk/test/java/security/MessageDigest/TestSameValue.java
@ -37,6 +37,8 @@ import jdk.test.lib.RandomFactory;
 * @author Kevin Liu
 * @key randomness
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
+ * @run main TestSameValue
 */

 public class TestSameValue {
--- a/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java
+++ b/jdk/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java
@ -34,6 +34,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8050402
 * @summary Check policy is extensible with user defined permissions
 * @library /lib/testlibrary /test/lib
+ * @build jdk.test.lib.util.JarUtils
 * @compile TVJar/TVPermission.java
 * @run main ExtensiblePolicyWithJarTest
 */
--- a/jdk/test/java/security/SecureRandom/DrbgParametersSpec.java
+++ b/jdk/test/java/security/SecureRandom/DrbgParametersSpec.java
@ -25,6 +25,8 @@
 * @bug 8051408 8158534
 * @summary Make sure DrbgParameters coded as specified
 * @library /test/lib
+ * @build jdk.test.lib.Asserts
+ * @run main DrbgParametersSpec
 */

 import jdk.test.lib.Asserts;
--- a/jdk/test/java/security/Signature/Offsets.java
+++ b/jdk/test/java/security/Signature/Offsets.java
@ -42,6 +42,7 @@ import jdk.test.lib.RandomFactory;
 *          generation, the test tries to verify signature with the above API
 *          and passing in different signature offset (0, 33, 66, 99).
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main Offsets SUN NONEwithDSA
 * @run main Offsets SUN SHA1withDSA
 * @run main Offsets SUN SHA224withDSA
--- a/jdk/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java
+++ b/jdk/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java
@ -35,6 +35,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=DTLS
 *      -Dtest.mode=norm DTLSIncorrectAppDataTest
 * @run main/othervm -Dtest.security.protocol=DTLS
--- a/jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java
@ -35,6 +35,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=DTLS
 *      DTLSRehandshakeWithCipherChangeTest
 */
--- a/jdk/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java
+++ b/jdk/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java
@ -36,6 +36,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=DTLS
 *      -Dtest.mode=norm DTLSSequenceNumberTest
 * @run main/othervm -Dtest.security.protocol=DTLS
--- a/jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java
@ -35,6 +35,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=DTLSv1.0
 *      DTLSv10RehandshakeWithCipherChangeTest
 */
--- a/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java
@ -35,6 +35,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=TLS TLSRehandshakeWithCipherChangeTest
 */

--- a/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java
@ -35,6 +35,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=TLSv1 TLSRehandshakeWithCipherChangeTest
 */

--- a/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java
@ -35,6 +35,7 @@
 *          java.security.jgss/sun.security.krb5.internal.crypto
 *          java.security.jgss/sun.security.krb5.internal.ktab
 *          java.base/sun.security.util
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Dtest.security.protocol=TLSv1.1 TLSRehandshakeWithCipherChangeTest
 */

--- a/jdk/test/jdk/security/jarsigner/Spec.java
+++ b/jdk/test/jdk/security/jarsigner/Spec.java
@ -30,6 +30,8 @@
 *          java.base/sun.security.provider.certpath
 *          jdk.jartool
 *          jdk.crypto.ec
+ * @build jdk.test.lib.util.JarUtils
+ * @run main Spec
 */

 import com.sun.jarsigner.ContentSigner;
--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
@ -32,7 +32,9 @@
 * @summary  Redirect problem with HttpsURLConnection using a proxy
 * @modules java.base/sun.net.www
 * @library .. /test/lib
- * @build HttpCallback TestHttpsServer ClosedChannelList
+ * @build jdk.test.lib.NetworkConfiguration
+ *        jdk.test.lib.Platform
+ *        HttpCallback TestHttpsServer ClosedChannelList
 *        HttpTransaction TunnelProxy
 * @key intermittent
 * @run main/othervm B6216082
--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
@ -39,6 +39,12 @@ import jdk.test.lib.process.ProcessTools;
 *          that serves http POST method requests in secure channel, and a client
 *          that makes https POST request through a proxy.
 * @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.*
 * @compile OriginServer.java ProxyTunnelServer.java
 * @run main/othervm PostThruProxy
 */
--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
@ -39,6 +39,12 @@ import jdk.test.lib.process.ProcessTools;
 *          http POST method requests in secure channel, and a client that
 *          makes https POST request through a proxy.
 * @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.*
 * @compile OriginServer.java ProxyTunnelServer.java
 * @run main/othervm -Djdk.http.auth.tunneling.disabledSchemes= PostThruProxyWithAuth
 */
--- a/jdk/test/sun/net/www/protocol/jar/GetContentTypeTest.java
+++ b/jdk/test/sun/net/www/protocol/jar/GetContentTypeTest.java
@ -25,9 +25,13 @@
 * @test
 * @bug 4274624
 * @library /test/lib
- * @build GetContentType GetContentTypeTest
+ * @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.*
+ *        GetContentType GetContentTypeTest
 * @run main/othervm GetContentTypeTest
 * @summary Test JarURLConnection.getContentType would
 *          would return default "content/unknown"
--- a/jdk/test/sun/net/www/protocol/jar/jarbug/TestDriver.java
+++ b/jdk/test/sun/net/www/protocol/jar/jarbug/TestDriver.java
@ -27,10 +27,14 @@
 * @library /test/lib
 *          /lib/testlibrary
 * @modules jdk.compiler
- * @build src.test.src.TestDriver JarUtils
- *        jdk.test.lib.compiler.CompilerUtils
+ * @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.*
+ *        src.test.src.TestDriver JarUtils
 * @summary various resource and classloading bugs related to jar files
 * @run main/othervm TestDriver
 */
--- a/jdk/test/sun/nio/cs/FindDecoderBugs.java
+++ b/jdk/test/sun/nio/cs/FindDecoderBugs.java
@ -26,6 +26,7 @@
 * @bug 6380723
 * @summary Decode many byte sequences in many ways (use -Dseed=X to set PRNG seed)
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main/timeout=1800 FindDecoderBugs
 * @author Martin Buchholz
 * @key randomness
--- a/jdk/test/sun/nio/cs/FindEncoderBugs.java
+++ b/jdk/test/sun/nio/cs/FindEncoderBugs.java
@ -26,6 +26,7 @@
 * @bug 6233345 6381699 6381702 6381705 6381706
 * @summary Encode many char sequences in many ways
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main/timeout=1200 FindEncoderBugs
 * @author Martin Buchholz
 * @key randomness
--- a/jdk/test/sun/security/ec/SignatureOffsets.java
+++ b/jdk/test/sun/security/ec/SignatureOffsets.java
@ -35,6 +35,7 @@ import java.security.SignatureException;
 *          generation, the test tries to verify signature with the above API
 *          and passing in different signature offset (0, 33, 66, 99).
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @compile ../../../java/security/Signature/Offsets.java
 * @run main SignatureOffsets SunEC NONEwithECDSA
 * @run main SignatureOffsets SunEC SHA1withECDSA
--- a/jdk/test/sun/security/krb5/auto/ModuleName.java
+++ b/jdk/test/sun/security/krb5/auto/ModuleName.java
@ -27,6 +27,12 @@
 * @summary GSSContext type when jdk.security.jgss is not available
 * @library /test/lib
 * @compile -XDignore.symbol.file ModuleName.java
+ * @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/othervm ModuleName
 */

--- a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java
+++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java
@ -26,6 +26,7 @@
 * @bug 7152176 8168518 8172017
 * @summary More krb5 tests
 * @library ../../../../java/security/testlibrary/ /test/lib
+ * @build jdk.test.lib.Platform
 * @run main/othervm/timeout=300 ReplayCacheTestProc
 */

--- a/jdk/test/sun/security/krb5/auto/rcache_usemd5.sh
+++ b/jdk/test/sun/security/krb5/auto/rcache_usemd5.sh
@ -24,6 +24,7 @@
 # @test
 # @bug 8168518
 # @library ../../../../java/security/testlibrary/ /test/lib
+# @build jdk.test.lib.Platform
 # @run main/othervm/timeout=300 -Djdk.krb5.rcache.useMD5=true
 #           -Dtest.service=host ReplayCacheTestProc
 # @summary  testing jdk.krb5.rcache.useMD5. This action is put in a separate
--- a/jdk/test/sun/security/mscapi/SignatureOffsets.java
+++ b/jdk/test/sun/security/mscapi/SignatureOffsets.java
@ -35,6 +35,7 @@ import java.security.SignatureException;
 *          generation, the test tries to verify signature with the above API
 *          and passing in different signature offset (0, 33, 66, 99).
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @compile ../../../java/security/Signature/Offsets.java
 * @requires os.family == "windows"
 * @run main SignatureOffsets SunMSCAPI NONEwithRSA
--- a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java
+++ b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java
@ -29,6 +29,7 @@
 * @library ..
 * @library /test/lib
 * @modules jdk.crypto.cryptoki
+ * @build jdk.test.lib.RandomFactory
 * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator
 * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator
 *                                                   sm TestKeyPairGenerator.policy
--- a/jdk/test/sun/security/rsa/SignatureOffsets.java
+++ b/jdk/test/sun/security/rsa/SignatureOffsets.java
@ -35,6 +35,7 @@ import java.security.SignatureException;
 *          generation, the test tries to verify signature with the above API
 *          and passing in different signature offset (0, 33, 66, 99).
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @compile ../../../java/security/Signature/Offsets.java
 * @run main SignatureOffsets SunRsaSign MD2withRSA
 * @run main SignatureOffsets SunRsaSign MD5withRSA
--- a/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
+++ b/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
@ -50,6 +50,12 @@ import jdk.test.lib.process.ProcessTools;
 * @test
 * @summary Verify the restrictions for certificate path on JSSE with custom trust store.
 * @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.*
 * @compile JSSEClient.java
 * @run main/othervm -Djava.security.debug=certpath TLSRestrictions DEFAULT
 * @run main/othervm -Djava.security.debug=certpath TLSRestrictions C1
--- a/jdk/test/sun/security/ssl/rsa/SignatureOffsets.java
+++ b/jdk/test/sun/security/ssl/rsa/SignatureOffsets.java
@ -35,6 +35,7 @@ import java.security.SignatureException;
 *          generation, the test tries to verify signature with the above API
 *          and passing in different signature offset (0, 33, 66, 99).
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @compile ../../../../java/security/Signature/Offsets.java
 * @run main SignatureOffsets SunJSSE MD2withRSA
 * @run main SignatureOffsets SunJSSE MD5withRSA
--- a/jdk/test/sun/security/tools/jarsigner/AltProvider.java
+++ b/jdk/test/sun/security/tools/jarsigner/AltProvider.java
@ -27,6 +27,15 @@
 * @summary -providerPath, -providerClass, -addprovider, and -providerArg
 * @library /test/lib
 * @modules java.base/jdk.internal.misc
+ * @build jdk.test.lib.util.JarUtils
+ *        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 AltProvider
 */

 import jdk.test.lib.JDKToolLauncher;
--- a/jdk/test/sun/security/tools/jarsigner/Options.java
+++ b/jdk/test/sun/security/tools/jarsigner/Options.java
@ -31,6 +31,8 @@
 *          jdk.jartool/sun.security.tools.jarsigner
 *          java.base/sun.security.pkcs
 *          java.base/sun.security.x509
+ * @build jdk.test.lib.util.JarUtils
+ * @run main Options
 */

 import com.sun.jarsigner.ContentSigner;
--- a/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java
+++ b/jdk/test/sun/security/tools/jarsigner/TimestampCheck.java
@ -68,6 +68,14 @@ import sun.security.x509.X500Name;
 *          java.base/sun.security.tools.keytool
 * @library /lib/testlibrary
 * @library /test/lib
+ * @build jdk.test.lib.util.JarUtils
+ *        jdk.test.lib.SecurityTools
+ *        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/timeout=600 TimestampCheck
 */
 public class TimestampCheck {
--- a/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java
@ -36,6 +36,7 @@ import jdk.test.lib.util.JarUtils;
 *          java.base/sun.security.util
 *          java.base/sun.security.x509
 *          java.management
+ * @build jdk.test.lib.util.JarUtils
 * @run main TsacertOptionTest
 */
 public class TsacertOptionTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/Warning.java
+++ b/jdk/test/sun/security/tools/jarsigner/Warning.java
@ -35,6 +35,8 @@ import java.util.Arrays;
 * @bug 8024302 8026037 8130132
 * @summary warnings, errors and -strict
 * @library /lib/testlibrary /test/lib
+ * @build jdk.test.lib.util.JarUtils
+ * @run main Warning
 */
 public class Warning {

--- a/jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java
@ -26,6 +26,13 @@
 * @bug 8047305 8075618
 * @summary Tests jarsigner tool and JarSigner API work with multi-release JAR files.
 * @library /test/lib
+ * @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 MVJarSigningTest
 */

--- a/jdk/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for aliasNotInStore warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main AliasNotInStoreTest
 */
 public class AliasNotInStoreTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for badExtendedKeyUsage warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main BadExtendedKeyUsageTest
 */
 public class BadExtendedKeyUsageTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java
@ -30,6 +30,7 @@ import jdk.test.lib.util.JarUtils;
 * @summary Test for badKeyUsage warning
 * @library /lib/testlibrary /test/lib ../
 * @ignore until 8026393 is fixed
+ * @build jdk.test.lib.util.JarUtils
 * @run main BadKeyUsageTest
 */
 public class BadKeyUsageTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java
@ -33,6 +33,7 @@ import java.util.Base64;
 * @bug 8024302 8026037
 * @summary Test for badNetscapeCertType warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main BadNetscapeCertTypeTest
 */
 public class BadNetscapeCertTypeTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java
@ -31,6 +31,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for chainNotValidated warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main ChainNotValidatedTest
 */
 public class ChainNotValidatedTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for hasExpiredCert warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main HasExpiredCertTest
 */
 public class HasExpiredCertTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for hasExpiringCert warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main HasExpiringCertTest
 */
 public class HasExpiringCertTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for hasUnsignedEntry warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main HasUnsignedEntryTest
 */
 public class HasUnsignedEntryTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Checks if jarsigner prints appropriate warnings
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main MultipleWarningsTest
 */
 public class MultipleWarningsTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java
@ -30,6 +30,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Checks warnings if -tsa and -tsacert options are not specified
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main NoTimestampTest
 */
 public class NoTimestampTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for notSignedByAlias warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main NotSignedByAliasTest
 */
 public class NotSignedByAliasTest extends Test {
--- a/jdk/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java
+++ b/jdk/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java
@ -29,6 +29,7 @@ import jdk.test.lib.util.JarUtils;
 * @bug 8024302 8026037
 * @summary Test for notYetValidCert warning
 * @library /lib/testlibrary /test/lib ../
+ * @build jdk.test.lib.util.JarUtils
 * @run main NotYetValidCertTest
 */
 public class NotYetValidCertTest extends Test {
--- a/jdk/test/sun/security/tools/keytool/ImportPrompt.java
+++ b/jdk/test/sun/security/tools/keytool/ImportPrompt.java
@ -33,6 +33,14 @@ import java.security.KeyStore;
 * @bug 8172975
 * @summary SecurityTools.keytool() needs to accept user input
 * @library /test/lib
+ * @build jdk.test.lib.SecurityTools
+ *        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 ImportPrompt
 */

 public class ImportPrompt {
--- a/jdk/test/sun/security/tools/keytool/PrintSSL.java
+++ b/jdk/test/sun/security/tools/keytool/PrintSSL.java
@ -26,6 +26,13 @@
 * @bug 6480981 8160624
 * @summary keytool should be able to import certificates from remote SSL server
 * @library /test/lib
+ * @build jdk.test.lib.SecurityTools
+ *        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/othervm PrintSSL
 */

--- a/jdk/test/sun/security/tools/keytool/ReadJar.java
+++ b/jdk/test/sun/security/tools/keytool/ReadJar.java
@ -26,6 +26,15 @@
 * @bug 6890872 8168882
 * @summary keytool -printcert to recognize signed jar files
 * @library /test/lib
+ * @build jdk.test.lib.SecurityTools
+ *        jdk.test.lib.util.JarUtils
+ *        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 ReadJar
 */

 import java.nio.file.Files;
--- a/jdk/test/sun/security/tools/keytool/WeakAlg.java
+++ b/jdk/test/sun/security/tools/keytool/WeakAlg.java
@ -30,6 +30,13 @@
 * @modules java.base/sun.security.tools.keytool
 *          java.base/sun.security.tools
 *          java.base/sun.security.util
+ * @build jdk.test.lib.SecurityTools
+ *        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/othervm/timeout=600 -Duser.language=en -Duser.country=US WeakAlg
 */

--- a/jdk/test/tools/jar/InputFilesTest.java
+++ b/jdk/test/tools/jar/InputFilesTest.java
@ -30,6 +30,8 @@
 *          demonstrating identical behavior to JDK 8 jar tool.
 * @library /test/lib
 * @modules jdk.jartool
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
 * @run testng InputFilesTest
 */

--- a/Show More
+++ b/Show More