diff --git a/test/com/sun/jdi/BadHandshakeTest.java b/test/com/sun/jdi/BadHandshakeTest.java index 35afb33567a6d242ddc6e5ac34137c2c6a22afa9..7e35ce3fdd6c386b229119886353d6d44fbd52fe 100644 --- a/test/com/sun/jdi/BadHandshakeTest.java +++ b/test/com/sun/jdi/BadHandshakeTest.java @@ -26,7 +26,7 @@ * @summary Check that a bad handshake doesn't cause a debuggee to abort * @library /lib/testlibrary * - * @build VMConnection BadHandshakeTest Exit0 + * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0 * @run main BadHandshakeTest * */ diff --git a/test/com/sun/jdi/ExclusiveBind.java b/test/com/sun/jdi/ExclusiveBind.java index d53efd8d585ce4b03adca0ad0119917077cdfeb4..b5ca807d8f9165cb6e92ed4c91fcf0f1135368c6 100644 --- a/test/com/sun/jdi/ExclusiveBind.java +++ b/test/com/sun/jdi/ExclusiveBind.java @@ -27,8 +27,7 @@ * at the same time. * @library /lib/testlibrary * - * @build jdk.testlibrary.ProcessTools jdk.testlibrary.JDKToolLauncher jdk.testlibrary.Utils - * @build VMConnection ExclusiveBind HelloWorld + * @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld * @run main ExclusiveBind */ import java.net.ServerSocket; diff --git a/test/com/sun/tools/attach/BasicTests.java b/test/com/sun/tools/attach/BasicTests.java index 51f202becdbe31fdee98e2c8ff52485ced3a3e95..e8cf94775f04d1ab5760f0375e658733ed50ed93 100644 --- a/test/com/sun/tools/attach/BasicTests.java +++ b/test/com/sun/tools/attach/BasicTests.java @@ -38,7 +38,7 @@ import jdk.testlibrary.ProcessThread; * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 * @summary Basic unit tests for the VM attach mechanism. * @library /lib/testlibrary - * @run build Agent BadAgent RedefineAgent Application Shutdown RedefineDummy + * @build jdk.testlibrary.* Agent BadAgent RedefineAgent Application Shutdown RedefineDummy * @run main BasicTests * * This test will perform a number of basic attach tests. diff --git a/test/com/sun/tools/attach/PermissionTest.java b/test/com/sun/tools/attach/PermissionTest.java index 933ec2c23e85735add65ddaf36a667fb5ab7253a..4fbf49a541ba730eb53876159c62a0ee85810b02 100644 --- a/test/com/sun/tools/attach/PermissionTest.java +++ b/test/com/sun/tools/attach/PermissionTest.java @@ -34,7 +34,7 @@ import jdk.testlibrary.ProcessThread; * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 * @summary Basic unit tests for the VM attach mechanism. * @library /lib/testlibrary - * @run build Application Shutdown + * @build jdk.testlibrary.* Application Shutdown * @run main PermissionTest * * Unit test for Attach API - diff --git a/test/com/sun/tools/attach/ProviderTest.java b/test/com/sun/tools/attach/ProviderTest.java index 58ea6d5e75ae53bd0aa4009d76e60eb62c461538..ea30b5b91bf70dfead17690722c5dc448be0e339 100644 --- a/test/com/sun/tools/attach/ProviderTest.java +++ b/test/com/sun/tools/attach/ProviderTest.java @@ -33,7 +33,7 @@ import com.sun.tools.attach.spi.AttachProvider; * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 * @summary Basic unit tests for the VM attach mechanism. * @library /lib/testlibrary - * @run build SimpleProvider + * @build jdk.testlibrary.* SimpleProvider * @run main ProviderTest * * The test will attach and detach to/from the running Application. diff --git a/test/java/io/BufferedInputStream/LargeCopyWithMark.java b/test/java/io/BufferedInputStream/LargeCopyWithMark.java index 2555a1faa5fa1808b9dea21012cc97c397138626..74aeda92932e629866e72b82bbdb92b6284aeddc 100644 --- a/test/java/io/BufferedInputStream/LargeCopyWithMark.java +++ b/test/java/io/BufferedInputStream/LargeCopyWithMark.java @@ -26,6 +26,7 @@ * @summary BufferedInputStream calculates negative array size with large * streams and mark * @library /lib/testlibrary + * @build jdk.testlibrary.* * @run main/othervm LargeCopyWithMark */ diff --git a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java index 20c9077d02fdc9ba28c2cb5068fa04ae70d54d51..12246b1a6764a0904b4a1047aba45d5b78a691bd 100644 --- a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java +++ b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java @@ -26,7 +26,7 @@ * @summary Assert in java.lang.instrument agents during shutdown when classloading occurs after shutdown * @library /lib/testlibrary * - * @build DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread + * @build jdk.testlibrary.* DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread * @run shell ../MakeJAR3.sh DummyAgent * @run main TestDaemonThreadLauncher /timeout=240 * diff --git a/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java b/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java index 9d08a7bd9ec96df9d5fbf05924e6b8d1eb934b26..a59756900b8b7ad2c49b9ce5177e8bafdda2733b 100644 --- a/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java +++ b/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java @@ -30,7 +30,7 @@ import jdk.testlibrary.Utils; * @bug 6289149 * @summary test when the agent's class is missing the premain() function. * @library /lib/testlibrary - * @run build DummyMain + * @build jdk.testlibrary.* DummyMain * @run shell ../MakeJAR3.sh NoPremainAgent * @run main NoPremainAgentTest */ diff --git a/test/java/lang/instrument/PremainClass/PremainClassTest.java b/test/java/lang/instrument/PremainClass/PremainClassTest.java index 9ebe4a68d2cee9c818bcae44f6f27081dc9e9d43..dd83fa807cf429613c257d292add1aba7207fce7 100644 --- a/test/java/lang/instrument/PremainClass/PremainClassTest.java +++ b/test/java/lang/instrument/PremainClass/PremainClassTest.java @@ -30,7 +30,7 @@ import jdk.testlibrary.Utils; * @bug 5055293 * @summary Test non ascii characters in the Premain-Class attribute. * @library /lib/testlibrary - * @run build DummyMain + * @build jdk.testlibrary.* DummyMain * @run main PremainClassTest */ public class PremainClassTest { diff --git a/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java b/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java index 7b67e4c31b786011e1347917846c19b149e49551..1dadbd09f015a9b4235643be21cf4a0fecb39576 100644 --- a/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java +++ b/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java @@ -30,7 +30,7 @@ import jdk.testlibrary.Utils; * @bug 6289149 * @summary test when the agent's class has a zero arg premain() function. * @library /lib/testlibrary - * @run build DummyMain + * @build jdk.testlibrary.* DummyMain * @run shell ../MakeJAR3.sh ZeroArgPremainAgent * @run main ZeroArgPremainAgentTest */ diff --git a/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java b/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java index 739ca6dc255920bb7ee910287f74ffdbe2d44975..38baeae69f03f2c81d16286a02e1317c70804b7c 100644 --- a/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java +++ b/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java @@ -37,6 +37,7 @@ import java.util.function.Supplier; /* @test * @library /lib/testlibrary/jsr292 /lib/testlibrary/ * @compile CatchExceptionTest.java + * @build jdk.testlibrary.* * @run main/othervm -esa test.java.lang.invoke.MethodHandles.CatchExceptionTest */ public class CatchExceptionTest { diff --git a/test/java/net/URLClassLoader/closetest/CloseTest.java b/test/java/net/URLClassLoader/closetest/CloseTest.java index 4fcb7a5c310cb0465df63835ca4420ac450116c4..790c3bf76c56c7925d664bc9ab34e6e727a7ec09 100644 --- a/test/java/net/URLClassLoader/closetest/CloseTest.java +++ b/test/java/net/URLClassLoader/closetest/CloseTest.java @@ -26,7 +26,7 @@ * @bug 4167874 * @library ../../../../com/sun/net/httpserver * @library /lib/testlibrary - * @build FileServerHandler jdk.testlibrary.FileUtils + * @build jdk.testlibrary.* FileServerHandler * @run shell build.sh * @run main/othervm CloseTest * @summary URL-downloaded jar files can consume all available file descriptors diff --git a/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java b/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java index a11d58afe8fe9b1e85fb8486a0f2d4faa180305c..bffbb2c23bb07dc1de9b503dcc11497d743405e0 100644 --- a/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java +++ b/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java @@ -25,7 +25,7 @@ * @test * @bug 6899919 * @library /lib/testlibrary - * @build jdk.testlibrary.FileUtils + * @build jdk.testlibrary.* * @run shell build2.sh * @run main/othervm GetResourceAsStream */ diff --git a/test/java/net/URLPermission/nstest/lookup.sh b/test/java/net/URLPermission/nstest/lookup.sh index 89cfd101d21ee3c595cc635c25b1d71e169e8a0d..e97ea339200347e12ff99d2f3f1b556f3e62c3c9 100644 --- a/test/java/net/URLPermission/nstest/lookup.sh +++ b/test/java/net/URLPermission/nstest/lookup.sh @@ -26,6 +26,7 @@ # @library /lib/testlibrary # @compile -XDignore.symbol.file=true SimpleNameService.java # LookupTest.java SimpleNameServiceDescriptor.java +# @build jdk.testlibrary.* # @run shell/timeout=50 lookup.sh # diff --git a/test/java/util/zip/ZipFile/MultiThreadedReadTest.java b/test/java/util/zip/ZipFile/MultiThreadedReadTest.java index c1f69a90587381cdd43f7ae454b0b8d3ef1ac9bd..d4cbd5384d086ee66190dc247797908e0ea15148 100644 --- a/test/java/util/zip/ZipFile/MultiThreadedReadTest.java +++ b/test/java/util/zip/ZipFile/MultiThreadedReadTest.java @@ -25,7 +25,7 @@ * @bug 8038491 * @summary Crash in ZipFile.read() when ZipFileInputStream is shared between threads * @library /lib/testlibrary - * @build jdk.testlibrary.FileUtils + * @build jdk.testlibrary.* * @run main MultiThreadedReadTest */ diff --git a/test/javax/management/monitor/StartStopTest.java b/test/javax/management/monitor/StartStopTest.java index 80694c63e05c27f3db4a37499caf17067b57a96a..2f4175985726a562f8b8fdc452d4503a81973e2f 100644 --- a/test/javax/management/monitor/StartStopTest.java +++ b/test/javax/management/monitor/StartStopTest.java @@ -28,9 +28,8 @@ * monitors are started and stopped in a loop. * @author Luis-Miguel Alventosa * @library /lib/testlibrary - * @run build jdk.testlibrary.Utils * @run clean StartStopTest - * @run build StartStopTest + * @run build jdk.testlibrary.* StartStopTest * @run main/othervm/timeout=300 StartStopTest 1 * @run main/othervm/timeout=300 StartStopTest 2 * @run main/othervm/timeout=300 StartStopTest 3 diff --git a/test/sun/management/jdp/JdpDefaultsTest.java b/test/sun/management/jdp/JdpDefaultsTest.java index 9067be7cc05f33be8b4b6496c70b334c684bbae3..35a145fd330e7ee8ed10e0c4ab25423cc3467f80 100644 --- a/test/sun/management/jdp/JdpDefaultsTest.java +++ b/test/sun/management/jdp/JdpDefaultsTest.java @@ -28,7 +28,7 @@ * @test JdpDefaultsTest * @summary Assert that we can read JDP packets from a multicast socket connection, on default IP and port. * @library /lib/testlibrary - * @build ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher + * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main JdpDefaultsTest */ diff --git a/test/sun/management/jdp/JdpOffTest.java b/test/sun/management/jdp/JdpOffTest.java index 7810400abbe6c64cd59aed1b034996e459bb8d92..15b082e01ef11a49731b3b60843ac484ca981625 100644 --- a/test/sun/management/jdp/JdpOffTest.java +++ b/test/sun/management/jdp/JdpOffTest.java @@ -29,7 +29,7 @@ * @test JdpOffTest.java * @summary Assert that no JDP packets are sent to the default address and port. * @library /lib/testlibrary - * @build ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher + * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher * @run main JdpOffTest */ diff --git a/test/sun/management/jdp/JdpSpecificAddressTest.java b/test/sun/management/jdp/JdpSpecificAddressTest.java index 8a791766d85a92d7cb703430022a7d4a25cc6603..0b9d8e0232836cabba58ebffb7da4f9f2f681c25 100644 --- a/test/sun/management/jdp/JdpSpecificAddressTest.java +++ b/test/sun/management/jdp/JdpSpecificAddressTest.java @@ -28,7 +28,7 @@ * @test JdpSpecificAddressTest * @summary Assert that we can read JDP packets from a multicast socket connection, on specific IP and port. * @library /lib/testlibrary - * @build ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher + * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main JdpSpecificAddressTest */ diff --git a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java index ca448159cd10f2551aee3644c8fca5daed099af4..54c1b6150994eca85aa267958f5f71b71a9863eb 100644 --- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java +++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java @@ -41,8 +41,7 @@ import jdk.testlibrary.ProcessTools; * @test * @bug 6434402 8004926 * @library /lib/testlibrary - * @build jdk.testlibrary.ProcessTools - * @build TestManager TestApplication CustomLauncherTest + * @build jdk.testlibrary.* TestManager TestApplication CustomLauncherTest * @run main/othervm CustomLauncherTest * @author Jaroslav Bachorik */ diff --git a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java index 1d4bbb1fb79aa4206c9fa06768e9ae4ef5f7257d..6eecbda4d2291aa43b4d18e90570a5a80b216169 100644 --- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java +++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java @@ -42,8 +42,7 @@ import jdk.testlibrary.ProcessTools; * without connection or username/password details. * TestManager will attempt a connection to the address obtained from * both agent properties and jvmstat buffer. - * @build jdk.testlibrary.ProcessTools - * @build TestManager TestApplication + * @build jdk.testlibrary.* TestManager TestApplication * @run main/othervm/timeout=300 -XX:+UsePerfData LocalManagementTest */ diff --git a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java index fe3a77483774caeb5098f4396e1e101847b9b421..cacb7087c27bb3c56d207b6769d47d399ab1c1a0 100644 --- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java +++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java @@ -54,10 +54,7 @@ import jdk.testlibrary.JDKToolLauncher; * @test * @bug 7110104 * @library /lib/testlibrary - * @build jdk.testlibrary.ProcessTools - * @build jdk.testlibrary.JDKToolLauncher - * @build jdk.testlibrary.Utils - * @build JMXStartStopTest JMXStartStopDoSomething + * @build jdk.testlibrary.* JMXStartStopTest JMXStartStopDoSomething * @run main/othervm JMXStartStopTest * @summary Makes sure that enabling/disabling the management agent through * JCMD achieves the desired results diff --git a/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java b/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java index ae5c6596c1f8882a5f758d59885342b35fcf4a33..063746b175a96aa862f3b9982440f932ddf05cb8 100644 --- a/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java +++ b/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java @@ -28,6 +28,7 @@ * @author Robert Field * @library /lib/testlibrary * @compile -XDignore.symbol.file ManyNewInstanceAnonTest.java + * @build jdk.testlibrary.* * @run main ClassFileInstaller ManyNewInstanceAnonTest * @run main/othervm -Xbootclasspath/a:. -Xverify:all ManyNewInstanceAnonTest * @run main/othervm -Xbootclasspath/a:. -Xverify:all -Dsun.reflection.noInflation=true ManyNewInstanceAnonTest diff --git a/test/sun/tools/jstatd/TestJstatdDefaults.java b/test/sun/tools/jstatd/TestJstatdDefaults.java index d68f384c35ca464b2f7d293ee83282692db5f04d..c3973f824e96c68b45287e085195b7748a4fe254 100644 --- a/test/sun/tools/jstatd/TestJstatdDefaults.java +++ b/test/sun/tools/jstatd/TestJstatdDefaults.java @@ -25,7 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary - * @build JstatdTest JstatGCUtilParser + * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdDefaults */ public class TestJstatdDefaults { diff --git a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java index da81db13bc909ca7e4e3576b5d1f9f9012705b80..fdf2e484c46e8cda4bf713127fb4f03f5ce798df 100644 --- a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java +++ b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java @@ -25,7 +25,7 @@ * @test * @bug 4990825 7092186 * @library /lib/testlibrary - * @build JstatdTest JstatGCUtilParser + * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdExternalRegistry */ public class TestJstatdExternalRegistry { diff --git a/test/sun/tools/jstatd/TestJstatdPort.java b/test/sun/tools/jstatd/TestJstatdPort.java index f2d479b6e307f483d82805bb9b8c3e7f5c35eae2..bba8732bad92732ac4ddaa99a7e219d138147b3d 100644 --- a/test/sun/tools/jstatd/TestJstatdPort.java +++ b/test/sun/tools/jstatd/TestJstatdPort.java @@ -25,7 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary - * @build JstatdTest JstatGCUtilParser + * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPort */ public class TestJstatdPort { diff --git a/test/sun/tools/jstatd/TestJstatdPortAndServer.java b/test/sun/tools/jstatd/TestJstatdPortAndServer.java index e771561e99cd087c756a27e2eedff56306a630eb..6b516f9140df500bbfcf97b6db25d86075fe3c29 100644 --- a/test/sun/tools/jstatd/TestJstatdPortAndServer.java +++ b/test/sun/tools/jstatd/TestJstatdPortAndServer.java @@ -25,7 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary - * @build JstatdTest JstatGCUtilParser + * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPortAndServer */ public class TestJstatdPortAndServer { diff --git a/test/sun/tools/jstatd/TestJstatdServer.java b/test/sun/tools/jstatd/TestJstatdServer.java index f8e87a668fc4df3203316351668a78c4b6e003ac..fbf1c56026f5dcb078849eb196406c6ab97ee116 100644 --- a/test/sun/tools/jstatd/TestJstatdServer.java +++ b/test/sun/tools/jstatd/TestJstatdServer.java @@ -25,7 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary - * @build JstatdTest JstatGCUtilParser + * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdServer */ public class TestJstatdServer { diff --git a/test/sun/tools/jstatd/TestJstatdUsage.java b/test/sun/tools/jstatd/TestJstatdUsage.java index 3fd5efc19f37aef5c2ac887b00c18caef31351c5..abec798df6f8f040d62f411fbe4f025341a1c171 100644 --- a/test/sun/tools/jstatd/TestJstatdUsage.java +++ b/test/sun/tools/jstatd/TestJstatdUsage.java @@ -28,7 +28,7 @@ import jdk.testlibrary.OutputAnalyzer; * @test * @bug 4990825 * @library /lib/testlibrary - * @build jdk.testlibrary.JDKToolLauncher jdk.testlibrary.OutputAnalyzer + * @build jdk.testlibrary.* * @run main TestJstatdUsage */ public class TestJstatdUsage {