# HG changeset patch # User iignatyev # Date 1496938811 25200 # Thu Jun 08 09:20:11 2017 -0700 # Node ID 0c8bcdcc8d1652b52b8fff67c3a854a0918756a7 # Parent 8d381ca2a35823193cf11485f24c8bdfe48f865e 8181759: add explicit @build actions for jdk.test.lib classes in all :tier1 tests Reviewed-by: duke diff --git a/test/java/lang/Class/forName/modules/TestDriver.java b/test/java/lang/Class/forName/modules/TestDriver.java --- a/test/java/lang/Class/forName/modules/TestDriver.java +++ b/test/java/lang/Class/forName/modules/TestDriver.java @@ -43,7 +43,15 @@ * @summary Tests for Class.forName(Module,String) * @library /lib/testlibrary /test/lib * @modules jdk.compiler - * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.ProcessTools + * @build jdk.test.lib.compiler.CompilerUtils + * jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * jdk.testlibrary.ProcessTools * TestDriver TestMain TestLayer * @run testng TestDriver */ diff --git a/test/java/lang/Double/ParseHexFloatingPoint.java b/test/java/lang/Double/ParseHexFloatingPoint.java --- a/test/java/lang/Double/ParseHexFloatingPoint.java +++ b/test/java/lang/Double/ParseHexFloatingPoint.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main ParseHexFloatingPoint * @bug 4826774 8078672 * @summary Numerical tests for hexadecimal inputs to parse{Double, Float} (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Integer/BitTwiddle.java b/test/java/lang/Integer/BitTwiddle.java --- a/test/java/lang/Integer/BitTwiddle.java +++ b/test/java/lang/Integer/BitTwiddle.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main BitTwiddle * @bug 4495754 8078672 * @summary Basic test for int bit twiddling (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Long/BitTwiddle.java b/test/java/lang/Long/BitTwiddle.java --- a/test/java/lang/Long/BitTwiddle.java +++ b/test/java/lang/Long/BitTwiddle.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main BitTwiddle * @bug 4495754 8078672 * @summary Basic test for long bit twiddling (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Math/CubeRootTests.java b/test/java/lang/Math/CubeRootTests.java --- a/test/java/lang/Math/CubeRootTests.java +++ b/test/java/lang/Math/CubeRootTests.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main CubeRootTests * @bug 4347132 4939441 8078672 * @summary Tests for {Math, StrictMath}.cbrt (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Math/HypotTests.java b/test/java/lang/Math/HypotTests.java --- a/test/java/lang/Math/HypotTests.java +++ b/test/java/lang/Math/HypotTests.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main HypotTests * @bug 4851638 4939441 8078672 * @summary Tests for {Math, StrictMath}.hypot (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Math/IeeeRecommendedTests.java b/test/java/lang/Math/IeeeRecommendedTests.java --- a/test/java/lang/Math/IeeeRecommendedTests.java +++ b/test/java/lang/Math/IeeeRecommendedTests.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main IeeeRecommendedTests * @bug 4860891 4826732 4780454 4939441 4826652 8078672 * @summary Tests for IEEE 754[R] recommended functions and similar methods (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Math/Log1pTests.java b/test/java/lang/Math/Log1pTests.java --- a/test/java/lang/Math/Log1pTests.java +++ b/test/java/lang/Math/Log1pTests.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main Log1pTests * @bug 4851638 4939441 8078672 * @summary Tests for {Math, StrictMath}.log1p (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/Math/MultiplicationTests.java b/test/java/lang/Math/MultiplicationTests.java --- a/test/java/lang/Math/MultiplicationTests.java +++ b/test/java/lang/Math/MultiplicationTests.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main MultiplicationTests * @bug 5100935 * @summary Tests for multiplication methods (use -Dseed=X to set PRNG seed) diff --git a/test/java/lang/ProcessHandle/Basic.java b/test/java/lang/ProcessHandle/Basic.java --- a/test/java/lang/ProcessHandle/Basic.java +++ b/test/java/lang/ProcessHandle/Basic.java @@ -39,6 +39,12 @@ * @library /test/lib * @modules java.base/jdk.internal.misc * jdk.management + * @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 testng Basic * @summary Basic tests for ProcessHandler * @author Roger Riggs diff --git a/test/java/lang/ProcessHandle/InfoTest.java b/test/java/lang/ProcessHandle/InfoTest.java --- a/test/java/lang/ProcessHandle/InfoTest.java +++ b/test/java/lang/ProcessHandle/InfoTest.java @@ -51,7 +51,12 @@ * @library /test/lib * @modules java.base/jdk.internal.misc * jdk.management - * @build jdk.test.lib.Platform jdk.test.lib.Utils + * @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 testng InfoTest * @summary Functions of ProcessHandle.Info * @author Roger Riggs diff --git a/test/java/lang/ProcessHandle/OnExitTest.java b/test/java/lang/ProcessHandle/OnExitTest.java --- a/test/java/lang/ProcessHandle/OnExitTest.java +++ b/test/java/lang/ProcessHandle/OnExitTest.java @@ -43,7 +43,12 @@ * @library /test/lib * @modules java.base/jdk.internal.misc * jdk.management - * @build jdk.test.lib.Platform jdk.test.lib.Utils + * @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 testng OnExitTest * @summary Functions of Process.onExit and ProcessHandle.onExit * @author Roger Riggs diff --git a/test/java/lang/ProcessHandle/TreeTest.java b/test/java/lang/ProcessHandle/TreeTest.java --- a/test/java/lang/ProcessHandle/TreeTest.java +++ b/test/java/lang/ProcessHandle/TreeTest.java @@ -48,6 +48,11 @@ * @modules java.base/jdk.internal.misc * jdk.management * @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 testng/othervm TreeTest * @summary Test counting and JavaChild.spawning and counting of Processes. * @author Roger Riggs diff --git a/test/java/lang/StackTraceElement/WithClassLoaderName.java b/test/java/lang/StackTraceElement/WithClassLoaderName.java --- a/test/java/lang/StackTraceElement/WithClassLoaderName.java +++ b/test/java/lang/StackTraceElement/WithClassLoaderName.java @@ -27,7 +27,8 @@ * @summary Basic test StackTraceElement with class loader names * @library lib /lib/testlibrary /test/lib * @modules jdk.compiler - * @build m1/* WithClassLoaderName + * @build jdk.test.lib.compiler.CompilerUtils + * m1/* WithClassLoaderName * @run main/othervm m1/com.app.Main * @run main/othervm WithClassLoaderName */ diff --git a/test/java/lang/StackWalker/StackWalkTest.java b/test/java/lang/StackWalker/StackWalkTest.java --- a/test/java/lang/StackWalker/StackWalkTest.java +++ b/test/java/lang/StackWalker/StackWalkTest.java @@ -38,6 +38,7 @@ * @bug 8140450 * @summary Stack Walk Test (use -Dseed=X to set PRNG seed) * @library /test/lib + * @build jdk.test.lib.RandomFactory * @compile StackRecorderUtil.java * @run main/othervm StackWalkTest * @run main/othervm/java.security.policy=stackwalktest.policy StackWalkTest diff --git a/test/java/lang/StrictMath/CubeRootTests.java b/test/java/lang/StrictMath/CubeRootTests.java --- a/test/java/lang/StrictMath/CubeRootTests.java +++ b/test/java/lang/StrictMath/CubeRootTests.java @@ -26,6 +26,7 @@ * @bug 4347132 8136799 * @key randomness * @library /test/lib + * @build jdk.test.lib.RandomFactory * @build Tests * @build FdlibmTranslit * @build CubeRootTests diff --git a/test/java/lang/StrictMath/ExpTests.java b/test/java/lang/StrictMath/ExpTests.java --- a/test/java/lang/StrictMath/ExpTests.java +++ b/test/java/lang/StrictMath/ExpTests.java @@ -26,6 +26,7 @@ * @bug 8139688 * @key randomness * @library /test/lib + * @build jdk.test.lib.RandomFactory * @build Tests * @build FdlibmTranslit * @build ExpTests diff --git a/test/java/lang/StrictMath/HypotTests.java b/test/java/lang/StrictMath/HypotTests.java --- a/test/java/lang/StrictMath/HypotTests.java +++ b/test/java/lang/StrictMath/HypotTests.java @@ -27,6 +27,7 @@ * @key randomness * @summary Tests for StrictMath.hypot * @library /test/lib + * @build jdk.test.lib.RandomFactory * @build Tests * @build FdlibmTranslit * @build HypotTests diff --git a/test/java/lang/String/CompactString/SerializationTest.java b/test/java/lang/String/CompactString/SerializationTest.java --- a/test/java/lang/String/CompactString/SerializationTest.java +++ b/test/java/lang/String/CompactString/SerializationTest.java @@ -31,6 +31,7 @@ * @test * @bug 8077559 * @library /test/lib + * @build jdk.test.lib.util.SerializationUtils * @summary Tests Compact String. This one is testing String serialization * among -XX:+CompactStrings/-XX:-CompactStrings/LegacyString * @run testng/othervm -XX:+CompactStrings SerializationTest diff --git a/test/java/lang/String/LiteralReplace.java b/test/java/lang/String/LiteralReplace.java --- a/test/java/lang/String/LiteralReplace.java +++ b/test/java/lang/String/LiteralReplace.java @@ -24,6 +24,7 @@ /* @test * @bug 8058779 8054307 * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run testng LiteralReplace * @summary Basic tests of String.replace(CharSequence, CharSequence) * @key randomness diff --git a/test/java/lang/StringBuffer/CompactStringBufferSerialization.java b/test/java/lang/StringBuffer/CompactStringBufferSerialization.java --- a/test/java/lang/StringBuffer/CompactStringBufferSerialization.java +++ b/test/java/lang/StringBuffer/CompactStringBufferSerialization.java @@ -33,6 +33,7 @@ * @test * @bug 8077559 * @library /test/lib + * @build jdk.test.lib.util.SerializationUtils * @summary Tests Compact String. This one is testing StringBuffer serialization * among -XX:+CompactStrings/-XX:-CompactStrings/LegacyStringBuffer * @run testng/othervm -XX:+CompactStrings CompactStringBufferSerialization diff --git a/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java b/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java --- a/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java +++ b/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java @@ -33,6 +33,7 @@ * @test * @bug 8077559 * @library /test/lib + * @build jdk.test.lib.util.SerializationUtils * @summary Tests Compact String. This one is testing StringBuilder serialization * among -XX:+CompactStrings/-XX:-CompactStrings/LegacyStringBuilder * @run testng/othervm -XX:+CompactStrings CompactStringBuilderSerialization diff --git a/test/java/lang/Thread/ThreadStateTest.java b/test/java/lang/Thread/ThreadStateTest.java --- a/test/java/lang/Thread/ThreadStateTest.java +++ b/test/java/lang/Thread/ThreadStateTest.java @@ -33,6 +33,7 @@ * @library /lib/testlibrary * @library /test/lib * @build jdk.testlibrary.* + * @build jdk.test.lib.LockFreeLogger * @build ThreadStateTest ThreadStateController * @run main/othervm -Xmixed ThreadStateTest */ diff --git a/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java b/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java --- a/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java +++ b/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java @@ -29,6 +29,7 @@ * @summary Test verifies that lambda forms are garbage collected * @author kshefov * @library /lib/testlibrary /java/lang/invoke/common + * @build jdk.test.lib.TimeLimitedRunner * @build TestMethods * @build LambdaFormTestCase * @build LFGarbageCollectedTest diff --git a/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java b/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java --- a/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java +++ b/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java @@ -31,6 +31,7 @@ * @modules java.base/java.lang.invoke:open * java.base/java.lang.ref:open * java.management + * @build jdk.test.lib.TimeLimitedRunner * @build TestMethods * @build LambdaFormTestCase * @build LFCachingTestCase diff --git a/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java b/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java --- a/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java +++ b/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java @@ -31,6 +31,7 @@ * @modules java.base/java.lang.ref:open * java.base/java.lang.invoke:open * java.management + * @build jdk.test.lib.TimeLimitedRunner * @build TestMethods * @build LambdaFormTestCase * @build LFCachingTestCase diff --git a/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java b/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java --- a/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java +++ b/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java @@ -44,6 +44,7 @@ /* @test * @library /lib/testlibrary /java/lang/invoke/common /test/lib + * @build jdk.test.lib.TimeLimitedRunner * @compile CatchExceptionTest.java * @run main/othervm -esa test.java.lang.invoke.MethodHandles.CatchExceptionTest * @key intermittent randomness diff --git a/test/java/math/BigDecimal/StringConstructor.java b/test/java/math/BigDecimal/StringConstructor.java --- a/test/java/math/BigDecimal/StringConstructor.java +++ b/test/java/math/BigDecimal/StringConstructor.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main StringConstructor * @bug 4103117 4331084 4488017 4490929 6255285 6268365 8074460 8078672 * @summary Tests the BigDecimal string constructor (use -Dseed=X to set PRNG seed). diff --git a/test/java/math/BigInteger/BigIntegerTest.java b/test/java/math/BigInteger/BigIntegerTest.java --- a/test/java/math/BigInteger/BigIntegerTest.java +++ b/test/java/math/BigInteger/BigIntegerTest.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main BigIntegerTest * @bug 4181191 4161971 4227146 4194389 4823171 4624738 4812225 4837946 4026465 8074460 8078672 8032027 * @summary tests methods in BigInteger (use -Dseed=X to set PRNG seed) diff --git a/test/java/math/BigInteger/ModPow65537.java b/test/java/math/BigInteger/ModPow65537.java --- a/test/java/math/BigInteger/ModPow65537.java +++ b/test/java/math/BigInteger/ModPow65537.java @@ -24,6 +24,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main ModPow65537 * @bug 4891312 8074460 8078672 * @summary verify that modPow() not broken by the special case for 65537 (use -Dseed=X to set PRNG seed) diff --git a/test/java/math/BigInteger/PrimeTest.java b/test/java/math/BigInteger/PrimeTest.java --- a/test/java/math/BigInteger/PrimeTest.java +++ b/test/java/math/BigInteger/PrimeTest.java @@ -26,6 +26,7 @@ /* * @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main PrimeTest * @bug 8026236 8074460 8078672 * @summary test primality verification methods in BigInteger (use -Dseed=X to set PRNG seed) diff --git a/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java b/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java --- a/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java +++ b/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java @@ -28,6 +28,12 @@ * various bad values fail to launch the VM * @requires (os.arch == "x86_64") | (os.arch == "amd64") | (os.arch == "sparcv9") * @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 LimitDirectMemoryNegativeTest foo * @run main LimitDirectMemoryNegativeTest 10kmt diff --git a/test/java/util/Base64/TestBase64.java b/test/java/util/Base64/TestBase64.java --- a/test/java/util/Base64/TestBase64.java +++ b/test/java/util/Base64/TestBase64.java @@ -26,6 +26,7 @@ * 8014217 8025003 8026330 8028397 8129544 8165243 * @summary tests java.util.Base64 * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main TestBase64 * @key randomness */ diff --git a/test/java/util/List/SubList.java b/test/java/util/List/SubList.java --- a/test/java/util/List/SubList.java +++ b/test/java/util/List/SubList.java @@ -25,6 +25,7 @@ * @test * @bug 8079136 * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run testng SubList * @summary Basic functionality of sublists * @key randomness diff --git a/test/java/util/WeakHashMap/GCDuringIteration.java b/test/java/util/WeakHashMap/GCDuringIteration.java --- a/test/java/util/WeakHashMap/GCDuringIteration.java +++ b/test/java/util/WeakHashMap/GCDuringIteration.java @@ -25,6 +25,7 @@ * @test * @bug 6499848 * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main GCDuringIteration * @summary Check that iterators work properly in the presence of * concurrent finalization and removal of elements. diff --git a/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java b/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java --- a/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java +++ b/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java @@ -26,6 +26,7 @@ * @bug 6450200 * @summary Test proper handling of pool state changes * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main/othervm ConfigChanges * @key randomness * @author Martin Buchholz diff --git a/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java --- a/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java +++ b/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java @@ -27,7 +27,8 @@ * @summary Test the extended API and the aliasing additions in JarFile that * support multi-release jar files * @library /lib/testlibrary/java/util/jar /test/lib - * @build Compiler JarBuilder CreateMultiReleaseTestJars + * @build jdk.test.lib.RandomFactory + * Compiler JarBuilder CreateMultiReleaseTestJars * @run testng MultiReleaseJarAPI */ diff --git a/test/java/util/logging/FileHandlerMaxLocksTest.java b/test/java/util/logging/FileHandlerMaxLocksTest.java --- a/test/java/util/logging/FileHandlerMaxLocksTest.java +++ b/test/java/util/logging/FileHandlerMaxLocksTest.java @@ -29,6 +29,13 @@ * "logging.properties" file with default value of 100. This property can be * overriden by specifying this property in the custom config file. * @library /test/lib + * @build jdk.test.lib.Platform + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.process.* + * jdk.test.lib.util.FileUtils * @author rpatil * @run main/othervm FileHandlerMaxLocksTest */ diff --git a/test/java/util/regex/RegExTest.java b/test/java/util/regex/RegExTest.java --- a/test/java/util/regex/RegExTest.java +++ b/test/java/util/regex/RegExTest.java @@ -38,6 +38,7 @@ * 8176029 * * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main RegExTest * @key randomness */ diff --git a/test/java/util/zip/InflaterInputStream/TestAvailable.java b/test/java/util/zip/InflaterInputStream/TestAvailable.java --- a/test/java/util/zip/InflaterInputStream/TestAvailable.java +++ b/test/java/util/zip/InflaterInputStream/TestAvailable.java @@ -23,6 +23,7 @@ /* @test * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main TestAvailable * @bug 7031075 8161426 * @summary Make sure that available() method behaves as expected. diff --git a/test/java/util/zip/ZipFile/MultiThreadedReadTest.java b/test/java/util/zip/ZipFile/MultiThreadedReadTest.java --- a/test/java/util/zip/ZipFile/MultiThreadedReadTest.java +++ b/test/java/util/zip/ZipFile/MultiThreadedReadTest.java @@ -25,6 +25,13 @@ * @bug 8038491 * @summary Crash in ZipFile.read() when ZipFileInputStream is shared between threads * @library /test/lib + * @build jdk.test.lib.Platform + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.process.* + * jdk.test.lib.util.FileUtils * @run main MultiThreadedReadTest * @key randomness */ diff --git a/test/java/util/zip/ZipFile/ReadLongZipFileName.java b/test/java/util/zip/ZipFile/ReadLongZipFileName.java --- a/test/java/util/zip/ZipFile/ReadLongZipFileName.java +++ b/test/java/util/zip/ZipFile/ReadLongZipFileName.java @@ -25,6 +25,14 @@ * @test * @bug 6374379 * @library /test/lib + * @build jdk.test.lib.Platform + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.process.* + * jdk.test.lib.util.FileUtils + * @run main ReadLongZipFileName * @summary Verify that we can read zip file names > 255 chars long */ diff --git a/test/java/util/zip/ZipFile/ZipEntryFreeTest.java b/test/java/util/zip/ZipFile/ZipEntryFreeTest.java --- a/test/java/util/zip/ZipFile/ZipEntryFreeTest.java +++ b/test/java/util/zip/ZipFile/ZipEntryFreeTest.java @@ -25,6 +25,13 @@ * @bug 6907252 * @summary ZipFileInputStream Not Thread-Safe * @library /test/lib + * @build jdk.test.lib.Platform + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.process.* + * jdk.test.lib.util.FileUtils * @run main ZipEntryFreeTest */ diff --git a/test/jdk/internal/util/jar/TestVersionedStream.java b/test/jdk/internal/util/jar/TestVersionedStream.java --- a/test/jdk/internal/util/jar/TestVersionedStream.java +++ b/test/jdk/internal/util/jar/TestVersionedStream.java @@ -27,6 +27,13 @@ * @summary basic tests for multi-release jar versioned streams * @library /test/lib * @modules jdk.jartool/sun.tools.jar java.base/jdk.internal.util.jar + * @build jdk.test.lib.Platform + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.process.* + * jdk.test.lib.util.FileUtils * @run testng TestVersionedStream */ diff --git a/test/jdk/modules/incubator/ImageModules.java b/test/jdk/modules/incubator/ImageModules.java --- a/test/jdk/modules/incubator/ImageModules.java +++ b/test/jdk/modules/incubator/ImageModules.java @@ -28,7 +28,14 @@ * @library /lib/testlibrary /test/lib * @key intermittent * @modules jdk.compiler jdk.jartool jdk.jlink - * @build jdk.test.lib.compiler.CompilerUtils + * @build jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.process.* + * jdk.test.lib.util.FileUtils + * jdk.test.lib.Platform + * jdk.test.lib.compiler.CompilerUtils * @run testng/othervm ImageModules */ # HG changeset patch # User iignatyev # Date 1496938844 25200 # Thu Jun 08 09:20:44 2017 -0700 # Node ID 0b10936e7f02d764c65e41adc71e28d4bd7be42a # Parent 0c8bcdcc8d1652b52b8fff67c3a854a0918756a7 8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests Reviewed-by: duke diff --git a/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java b/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java --- a/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java +++ b/test/com/sun/corba/7130985/CorbaExceptionsCompileTest.java @@ -26,8 +26,15 @@ * @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.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * jdk.testlibrary.* * @run main CorbaExceptionsCompileTest */ diff --git a/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java b/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java --- a/test/com/sun/crypto/provider/CICO/PBEFunc/CipherNCFuncTest.java +++ b/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". diff --git a/test/java/io/FilePermission/Invalid.java b/test/java/io/FilePermission/Invalid.java --- a/test/java/io/FilePermission/Invalid.java +++ b/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; diff --git a/test/java/io/FilePermission/ReadFileOnPath.java b/test/java/io/FilePermission/ReadFileOnPath.java --- a/test/java/io/FilePermission/ReadFileOnPath.java +++ b/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 */ diff --git a/test/java/io/InputStream/ReadAllBytes.java b/test/java/io/InputStream/ReadAllBytes.java --- a/test/java/io/InputStream/ReadAllBytes.java +++ b/test/java/io/InputStream/ReadAllBytes.java @@ -33,6 +33,7 @@ * @test * @bug 8080835 * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main ReadAllBytes * @summary Basic test for InputStream.readAllBytes * @key randomness diff --git a/test/java/io/InputStream/ReadNBytes.java b/test/java/io/InputStream/ReadNBytes.java --- a/test/java/io/InputStream/ReadNBytes.java +++ b/test/java/io/InputStream/ReadNBytes.java @@ -33,6 +33,7 @@ * @test * @bug 8080835 * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main ReadNBytes * @summary Basic test for InputStream.readNBytes * @key randomness diff --git a/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java b/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java --- a/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java +++ b/test/java/io/Serializable/failureAtomicity/FailureAtomicity.java @@ -27,6 +27,13 @@ * @summary Better failure atomicity for default read object. * @modules jdk.compiler * @library /test/lib + * @build jdk.test.lib.util.FileUtils + * 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 FailureAtomicity.java SerialRef.java * @run main failureAtomicity.FailureAtomicity */ diff --git a/test/java/net/Inet6Address/B6206527.java b/test/java/net/Inet6Address/B6206527.java --- a/test/java/net/Inet6Address/B6206527.java +++ b/test/java/net/Inet6Address/B6206527.java @@ -26,6 +26,13 @@ * @bug 6206527 * @summary "cannot assign address" when binding ServerSocket on Suse 9 * @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 B6206527 */ diff --git a/test/java/net/Inet6Address/B6558853.java b/test/java/net/Inet6Address/B6558853.java --- a/test/java/net/Inet6Address/B6558853.java +++ b/test/java/net/Inet6Address/B6558853.java @@ -26,6 +26,13 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* * @run main B6558853 */ diff --git a/test/java/net/InetAddress/CheckJNI.java b/test/java/net/InetAddress/CheckJNI.java --- a/test/java/net/InetAddress/CheckJNI.java +++ b/test/java/net/InetAddress/CheckJNI.java @@ -25,6 +25,13 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* * @run main/othervm -Xcheck:jni CheckJNI */ diff --git a/test/java/net/MulticastSocket/JoinLeave.java b/test/java/net/MulticastSocket/JoinLeave.java --- a/test/java/net/MulticastSocket/JoinLeave.java +++ b/test/java/net/MulticastSocket/JoinLeave.java @@ -26,6 +26,13 @@ * @bug 4091811 4148753 4102731 * @summary Test java.net.MulticastSocket joinGroup and leaveGroup * @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 JoinLeave */ diff --git a/test/java/net/MulticastSocket/SetLoopbackMode.java b/test/java/net/MulticastSocket/SetLoopbackMode.java --- a/test/java/net/MulticastSocket/SetLoopbackMode.java +++ b/test/java/net/MulticastSocket/SetLoopbackMode.java @@ -26,6 +26,13 @@ * @bug 4686717 * @summary Test MulticastSocket.setLoopbackMode * @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/othervm SetLoopbackMode */ diff --git a/test/java/net/NetworkConfigurationProbe.java b/test/java/net/NetworkConfigurationProbe.java --- a/test/java/net/NetworkConfigurationProbe.java +++ b/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 */ diff --git a/test/java/net/Socket/LinkLocal.java b/test/java/net/Socket/LinkLocal.java --- a/test/java/net/Socket/LinkLocal.java +++ b/test/java/net/Socket/LinkLocal.java @@ -27,6 +27,13 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* * @run main LinkLocal */ diff --git a/test/java/net/Socket/OldSocketImplTestDriver.java b/test/java/net/Socket/OldSocketImplTestDriver.java --- a/test/java/net/Socket/OldSocketImplTestDriver.java +++ b/test/java/net/Socket/OldSocketImplTestDriver.java @@ -30,7 +30,12 @@ * @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 */ diff --git a/test/java/net/SocketPermission/SocketPermissionTest.java b/test/java/net/SocketPermission/SocketPermissionTest.java --- a/test/java/net/SocketPermission/SocketPermissionTest.java +++ b/test/java/net/SocketPermission/SocketPermissionTest.java @@ -26,6 +26,13 @@ * @bug 8047031 * @summary SocketPermission tests for legacy socket types * @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 testng/othervm SocketPermissionTest */ diff --git a/test/java/net/URLClassLoader/closetest/CloseTest.java b/test/java/net/URLClassLoader/closetest/CloseTest.java --- a/test/java/net/URLClassLoader/closetest/CloseTest.java +++ b/test/java/net/URLClassLoader/closetest/CloseTest.java @@ -30,7 +30,15 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * FileServerHandler JarUtils * @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 --- a/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java +++ b/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java @@ -26,7 +26,15 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * JarUtils * @run main/othervm GetResourceAsStream */ diff --git a/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java b/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java --- a/test/java/net/URLClassLoader/getresourceasstream/TestDriver.java +++ b/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 */ diff --git a/test/java/net/URLClassLoader/sealing/CheckSealedTest.java b/test/java/net/URLClassLoader/sealing/CheckSealedTest.java --- a/test/java/net/URLClassLoader/sealing/CheckSealedTest.java +++ b/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 */ diff --git a/test/java/net/URLConnection/6212146/TestDriver.java b/test/java/net/URLConnection/6212146/TestDriver.java --- a/test/java/net/URLConnection/6212146/TestDriver.java +++ b/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 */ diff --git a/test/java/net/httpclient/RequestBodyTest.java b/test/java/net/httpclient/RequestBodyTest.java --- a/test/java/net/httpclient/RequestBodyTest.java +++ b/test/java/net/httpclient/RequestBodyTest.java @@ -29,6 +29,13 @@ * @library /lib/testlibrary/ /test/lib * @compile ../../../com/sun/net/httpserver/LogFilter.java * @compile ../../../com/sun/net/httpserver/FileServerHandler.java + * @build jdk.test.lib.util.FileUtils + * @build jdk.test.lib.Utils + * @build jdk.test.lib.Asserts + * @build jdk.test.lib.JDKToolFinder + * @build jdk.test.lib.JDKToolLauncher + * @build jdk.test.lib.Platform + * @build jdk.test.lib.process.* * @build LightWeightHttpServer * @build jdk.testlibrary.SimpleSSLContext * @run testng/othervm RequestBodyTest diff --git a/test/java/net/ipv6tests/B6521014.java b/test/java/net/ipv6tests/B6521014.java --- a/test/java/net/ipv6tests/B6521014.java +++ b/test/java/net/ipv6tests/B6521014.java @@ -26,6 +26,13 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* * @run main B6521014 */ diff --git a/test/java/net/spi/URLStreamHandlerProvider/Basic.java b/test/java/net/spi/URLStreamHandlerProvider/Basic.java --- a/test/java/net/spi/URLStreamHandlerProvider/Basic.java +++ b/test/java/net/spi/URLStreamHandlerProvider/Basic.java @@ -56,6 +56,13 @@ * @modules jdk.compiler * @summary Basic test for URLStreamHandlerProvider * @library /lib/testlibrary /test/lib + * @build jdk.test.lib.util.FileUtils + * 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 jdk.testlibrary.JDKToolFinder * @compile Basic.java Child.java * @run main Basic diff --git a/test/java/nio/channels/AsynchronousSocketChannel/Basic.java b/test/java/nio/channels/AsynchronousSocketChannel/Basic.java --- a/test/java/nio/channels/AsynchronousSocketChannel/Basic.java +++ b/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 */ diff --git a/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java b/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java --- a/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java +++ b/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java @@ -25,7 +25,14 @@ * @bug 4527345 * @summary Unit test for DatagramChannel's multicast support * @library /test/lib - * @build BasicMulticastTests + * @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.* + * BasicMulticastTests * @run main BasicMulticastTests */ diff --git a/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java b/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java --- a/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java +++ b/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java @@ -25,7 +25,14 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * MulticastSendReceiveTests * @run main MulticastSendReceiveTests * @run main/othervm -Djava.net.preferIPv4Stack=true MulticastSendReceiveTests * @key randomness diff --git a/test/java/nio/channels/DatagramChannel/Promiscuous.java b/test/java/nio/channels/DatagramChannel/Promiscuous.java --- a/test/java/nio/channels/DatagramChannel/Promiscuous.java +++ b/test/java/nio/channels/DatagramChannel/Promiscuous.java @@ -26,7 +26,14 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * Promiscuous * @run main Promiscuous * @run main/othervm -Djava.net.preferIPv4Stack=true Promiscuous * @key randomness diff --git a/test/java/nio/channels/FileChannel/Transfer.java b/test/java/nio/channels/FileChannel/Transfer.java --- a/test/java/nio/channels/FileChannel/Transfer.java +++ b/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 */ diff --git a/test/java/nio/channels/Selector/LotsOfUpdatesTest.java b/test/java/nio/channels/Selector/LotsOfUpdatesTest.java --- a/test/java/nio/channels/Selector/LotsOfUpdatesTest.java +++ b/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 */ diff --git a/test/java/nio/channels/SocketChannel/VectorIO.java b/test/java/nio/channels/SocketChannel/VectorIO.java --- a/test/java/nio/channels/SocketChannel/VectorIO.java +++ b/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 */ diff --git a/test/java/nio/file/FileStore/Basic.java b/test/java/nio/file/FileStore/Basic.java --- a/test/java/nio/file/FileStore/Basic.java +++ b/test/java/nio/file/FileStore/Basic.java @@ -26,6 +26,13 @@ * @summary Unit test for java.nio.file.FileStore * @key intermittent * @library .. /test/lib + * @build jdk.test.lib.util.FileUtils + * 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 Basic */ diff --git a/test/java/nio/file/FileSystem/Basic.java b/test/java/nio/file/FileSystem/Basic.java --- a/test/java/nio/file/FileSystem/Basic.java +++ b/test/java/nio/file/FileSystem/Basic.java @@ -25,6 +25,13 @@ * @bug 4313887 6838333 8132497 * @summary Unit test for java.nio.file.FileSystem * @library .. /test/lib + * @build jdk.test.lib.util.FileUtils + * 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 Basic */ diff --git a/test/java/nio/file/Files/CopyAndMove.java b/test/java/nio/file/Files/CopyAndMove.java --- a/test/java/nio/file/Files/CopyAndMove.java +++ b/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 */ diff --git a/test/java/nio/file/Files/StreamLinesTest.java b/test/java/nio/file/Files/StreamLinesTest.java --- a/test/java/nio/file/Files/StreamLinesTest.java +++ b/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 diff --git a/test/java/nio/file/WatchService/LotsOfEvents.java b/test/java/nio/file/WatchService/LotsOfEvents.java --- a/test/java/nio/file/WatchService/LotsOfEvents.java +++ b/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 */ diff --git a/test/java/security/AccessController/DoPrivAccompliceTest.java b/test/java/security/AccessController/DoPrivAccompliceTest.java --- a/test/java/security/AccessController/DoPrivAccompliceTest.java +++ b/test/java/security/AccessController/DoPrivAccompliceTest.java @@ -42,7 +42,13 @@ * 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 */ diff --git a/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java b/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java --- a/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java +++ b/test/java/security/KeyStore/PKCS12/EntryProtectionTest.java @@ -42,6 +42,8 @@ * 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(); diff --git a/test/java/security/MessageDigest/TestDigestIOStream.java b/test/java/security/MessageDigest/TestDigestIOStream.java --- a/test/java/security/MessageDigest/TestDigestIOStream.java +++ b/test/java/security/MessageDigest/TestDigestIOStream.java @@ -41,6 +41,7 @@ * @author Kevin Liu * @key randomness * @library /test/lib + * @build jdk.test.lib.RandomFactory * @run main/timeout=180 TestDigestIOStream */ diff --git a/test/java/security/MessageDigest/TestSameLength.java b/test/java/security/MessageDigest/TestSameLength.java --- a/test/java/security/MessageDigest/TestSameLength.java +++ b/test/java/security/MessageDigest/TestSameLength.java @@ -36,6 +36,8 @@ * @author Kevin Liu * @key randomness * @library /test/lib + * @build jdk.test.lib.RandomFactory + * @run main TestSameLength */ public class TestSameLength { diff --git a/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java b/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java --- a/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java +++ b/test/java/security/Policy/ExtensiblePolicy/ExtensiblePolicyWithJarTest.java @@ -34,6 +34,7 @@ * @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 */ diff --git a/test/java/security/SecureRandom/DrbgParametersSpec.java b/test/java/security/SecureRandom/DrbgParametersSpec.java --- a/test/java/security/SecureRandom/DrbgParametersSpec.java +++ b/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; diff --git a/test/java/security/Signature/Offsets.java b/test/java/security/Signature/Offsets.java --- a/test/java/security/Signature/Offsets.java +++ b/test/java/security/Signature/Offsets.java @@ -42,6 +42,7 @@ * 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 diff --git a/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java b/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java --- a/test/javax/net/ssl/DTLS/DTLSIncorrectAppDataTest.java +++ b/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 diff --git a/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java b/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java --- a/test/javax/net/ssl/DTLS/DTLSRehandshakeWithCipherChangeTest.java +++ b/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 */ diff --git a/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java b/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java --- a/test/javax/net/ssl/DTLS/DTLSSequenceNumberTest.java +++ b/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 diff --git a/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java b/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java --- a/test/javax/net/ssl/DTLSv10/DTLSv10RehandshakeWithCipherChangeTest.java +++ b/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 */ diff --git a/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java b/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java --- a/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java +++ b/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 */ diff --git a/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java b/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java --- a/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java +++ b/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 */ diff --git a/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java b/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java --- a/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java +++ b/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 */ diff --git a/test/jdk/security/jarsigner/Spec.java b/test/jdk/security/jarsigner/Spec.java --- a/test/jdk/security/jarsigner/Spec.java +++ b/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; diff --git a/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java b/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java --- a/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java +++ b/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java @@ -32,7 +32,14 @@ * @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.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * HttpCallback TestHttpsServer ClosedChannelList * HttpTransaction TunnelProxy * @key intermittent * @run main/othervm B6216082 diff --git a/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java b/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java --- a/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java +++ b/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java @@ -39,6 +39,12 @@ * 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 */ diff --git a/test/sun/nio/cs/FindDecoderBugs.java b/test/sun/nio/cs/FindDecoderBugs.java --- a/test/sun/nio/cs/FindDecoderBugs.java +++ b/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 diff --git a/test/sun/nio/cs/FindEncoderBugs.java b/test/sun/nio/cs/FindEncoderBugs.java --- a/test/sun/nio/cs/FindEncoderBugs.java +++ b/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 diff --git a/test/sun/security/ec/SignatureOffsets.java b/test/sun/security/ec/SignatureOffsets.java --- a/test/sun/security/ec/SignatureOffsets.java +++ b/test/sun/security/ec/SignatureOffsets.java @@ -35,6 +35,7 @@ * 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 diff --git a/test/sun/security/mscapi/SignatureOffsets.java b/test/sun/security/mscapi/SignatureOffsets.java --- a/test/sun/security/mscapi/SignatureOffsets.java +++ b/test/sun/security/mscapi/SignatureOffsets.java @@ -35,6 +35,7 @@ * 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 diff --git a/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java b/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java --- a/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java +++ b/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 diff --git a/test/sun/security/rsa/SignatureOffsets.java b/test/sun/security/rsa/SignatureOffsets.java --- a/test/sun/security/rsa/SignatureOffsets.java +++ b/test/sun/security/rsa/SignatureOffsets.java @@ -35,6 +35,7 @@ * 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 diff --git a/test/sun/security/ssl/rsa/SignatureOffsets.java b/test/sun/security/ssl/rsa/SignatureOffsets.java --- a/test/sun/security/ssl/rsa/SignatureOffsets.java +++ b/test/sun/security/ssl/rsa/SignatureOffsets.java @@ -35,6 +35,7 @@ * 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 diff --git a/test/sun/security/tools/jarsigner/AltProvider.java b/test/sun/security/tools/jarsigner/AltProvider.java --- a/test/sun/security/tools/jarsigner/AltProvider.java +++ b/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; diff --git a/test/sun/security/tools/jarsigner/Options.java b/test/sun/security/tools/jarsigner/Options.java --- a/test/sun/security/tools/jarsigner/Options.java +++ b/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; diff --git a/test/sun/security/tools/jarsigner/TimestampCheck.java b/test/sun/security/tools/jarsigner/TimestampCheck.java --- a/test/sun/security/tools/jarsigner/TimestampCheck.java +++ b/test/sun/security/tools/jarsigner/TimestampCheck.java @@ -68,6 +68,14 @@ * 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 { diff --git a/test/sun/security/tools/jarsigner/TsacertOptionTest.java b/test/sun/security/tools/jarsigner/TsacertOptionTest.java --- a/test/sun/security/tools/jarsigner/TsacertOptionTest.java +++ b/test/sun/security/tools/jarsigner/TsacertOptionTest.java @@ -36,6 +36,14 @@ * java.base/sun.security.util * java.base/sun.security.x509 * java.management + * @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 TsacertOptionTest */ public class TsacertOptionTest extends Test { diff --git a/test/sun/security/tools/jarsigner/Warning.java b/test/sun/security/tools/jarsigner/Warning.java --- a/test/sun/security/tools/jarsigner/Warning.java +++ b/test/sun/security/tools/jarsigner/Warning.java @@ -35,6 +35,8 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java b/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java --- a/test/sun/security/tools/jarsigner/multiRelease/MVJarSigningTest.java +++ b/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 */ diff --git a/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java b/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java --- a/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java +++ b/test/sun/security/tools/jarsigner/warnings/AliasNotInStoreTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java b/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java --- a/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java +++ b/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java b/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java --- a/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java +++ b/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java @@ -30,6 +30,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java b/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java --- a/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java +++ b/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java @@ -33,6 +33,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java b/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java --- a/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java +++ b/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java @@ -31,6 +31,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java b/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java --- a/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java +++ b/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java b/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java --- a/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java +++ b/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java b/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java --- a/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java +++ b/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java b/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java --- a/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java +++ b/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java b/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java --- a/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java +++ b/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java @@ -30,6 +30,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java b/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java --- a/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java +++ b/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java b/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java --- a/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java +++ b/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java @@ -29,6 +29,7 @@ * @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 { diff --git a/test/sun/security/tools/keytool/ImportPrompt.java b/test/sun/security/tools/keytool/ImportPrompt.java --- a/test/sun/security/tools/keytool/ImportPrompt.java +++ b/test/sun/security/tools/keytool/ImportPrompt.java @@ -33,6 +33,14 @@ * @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 { diff --git a/test/sun/security/tools/keytool/PrintSSL.java b/test/sun/security/tools/keytool/PrintSSL.java --- a/test/sun/security/tools/keytool/PrintSSL.java +++ b/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 */ diff --git a/test/sun/security/tools/keytool/ReadJar.java b/test/sun/security/tools/keytool/ReadJar.java --- a/test/sun/security/tools/keytool/ReadJar.java +++ b/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; diff --git a/test/sun/security/tools/keytool/WeakAlg.java b/test/sun/security/tools/keytool/WeakAlg.java --- a/test/sun/security/tools/keytool/WeakAlg.java +++ b/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 */ diff --git a/test/tools/jar/InputFilesTest.java b/test/tools/jar/InputFilesTest.java --- a/test/tools/jar/InputFilesTest.java +++ b/test/tools/jar/InputFilesTest.java @@ -30,6 +30,13 @@ * demonstrating identical behavior to JDK 8 jar tool. * @library /test/lib * @modules jdk.jartool + * @build jdk.test.lib.util.FileUtils + * 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 InputFilesTest */ diff --git a/test/tools/jar/ReleaseBeforeFiles.java b/test/tools/jar/ReleaseBeforeFiles.java --- a/test/tools/jar/ReleaseBeforeFiles.java +++ b/test/tools/jar/ReleaseBeforeFiles.java @@ -29,6 +29,13 @@ * not the --release option is preceded by a file name. * @library /test/lib * @modules jdk.jartool/sun.tools.jar + * @build jdk.test.lib.util.FileUtils + * 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 ReleaseBeforeFiles */ diff --git a/test/tools/jar/compat/CLICompatibility.java b/test/tools/jar/compat/CLICompatibility.java --- a/test/tools/jar/compat/CLICompatibility.java +++ b/test/tools/jar/compat/CLICompatibility.java @@ -50,7 +50,14 @@ * @test * @bug 8170952 * @library /lib/testlibrary /test/lib - * @build jdk.testlibrary.JDKToolFinder + * @build jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * jdk.testlibrary.JDKToolFinder * @run testng CLICompatibility * @summary Basic test for compatibility of CLI options */ diff --git a/test/tools/jar/mmrjar/Basic.java b/test/tools/jar/mmrjar/Basic.java --- a/test/tools/jar/mmrjar/Basic.java +++ b/test/tools/jar/mmrjar/Basic.java @@ -30,6 +30,13 @@ * jdk.compiler * jdk.jartool * @library /test/lib + * @build jdk.test.lib.util.FileUtils + * 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 Basic */ diff --git a/test/tools/jar/modularJar/Basic.java b/test/tools/jar/modularJar/Basic.java --- a/test/tools/jar/modularJar/Basic.java +++ b/test/tools/jar/modularJar/Basic.java @@ -50,7 +50,14 @@ * @library /lib/testlibrary /test/lib * @modules jdk.compiler * jdk.jartool - * @build jdk.testlibrary.JDKToolFinder + * @build jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * jdk.testlibrary.JDKToolFinder * @compile Basic.java * @run testng Basic * @summary Tests for plain Modular jars & Multi-Release Modular jars diff --git a/test/tools/jar/multiRelease/ApiValidatorTest.java b/test/tools/jar/multiRelease/ApiValidatorTest.java --- a/test/tools/jar/multiRelease/ApiValidatorTest.java +++ b/test/tools/jar/multiRelease/ApiValidatorTest.java @@ -28,7 +28,14 @@ * @modules java.base/jdk.internal.misc * jdk.compiler * jdk.jartool - * @build MRTestBase + * @build jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * MRTestBase * @run testng/timeout=1200 ApiValidatorTest */ diff --git a/test/tools/jar/multiRelease/Basic.java b/test/tools/jar/multiRelease/Basic.java --- a/test/tools/jar/multiRelease/Basic.java +++ b/test/tools/jar/multiRelease/Basic.java @@ -27,7 +27,14 @@ * @modules java.base/jdk.internal.misc * jdk.compiler * jdk.jartool - * @build MRTestBase + * @build jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * MRTestBase * @run testng Basic */ diff --git a/test/tools/jar/multiRelease/Basic1.java b/test/tools/jar/multiRelease/Basic1.java --- a/test/tools/jar/multiRelease/Basic1.java +++ b/test/tools/jar/multiRelease/Basic1.java @@ -27,8 +27,14 @@ * @modules java.base/jdk.internal.misc * jdk.compiler * jdk.jartool - * @build jdk.test.lib.JDKToolFinder jdk.test.lib.Utils - * @build MRTestBase + * @build jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * MRTestBase * @run testng Basic1 */ diff --git a/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java b/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java --- a/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java +++ b/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java @@ -42,8 +42,15 @@ * @test * @library /lib/testlibrary /test/lib * @modules jdk.compiler jdk.jlink - * @build CompiledVersionTest jdk.testlibrary.ProcessTools - * jdk.test.lib.compiler.CompilerUtils + * @build jdk.test.lib.compiler.CompilerUtils + * jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * CompiledVersionTest jdk.testlibrary.ProcessTools * @run testng CompiledVersionTest */ diff --git a/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java b/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java --- a/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java +++ b/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java @@ -48,8 +48,15 @@ * @modules jdk.compiler jdk.jlink * @modules java.base/jdk.internal.module * @modules java.base/jdk.internal.org.objectweb.asm - * @build ModuleTargetHelper UserModuleTest jdk.testlibrary.ProcessTools - * jdk.test.lib.compiler.CompilerUtils + * @build jdk.test.lib.compiler.CompilerUtils + * jdk.test.lib.util.FileUtils + * jdk.test.lib.Utils + * jdk.test.lib.Asserts + * jdk.test.lib.JDKToolFinder + * jdk.test.lib.JDKToolLauncher + * jdk.test.lib.Platform + * jdk.test.lib.process.* + * ModuleTargetHelper UserModuleTest jdk.testlibrary.ProcessTools * @run testng UserModuleTest */ diff --git a/test/tools/jmod/JmodNegativeTest.java b/test/tools/jmod/JmodNegativeTest.java --- a/test/tools/jmod/JmodNegativeTest.java +++ b/test/tools/jmod/JmodNegativeTest.java @@ -27,6 +27,13 @@ * @modules jdk.compiler * jdk.jlink * @build jdk.test.lib.compiler.CompilerUtils + * jdk.test.lib.util.FileUtils + * 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 JmodNegativeTest * @summary Negative tests for jmod */ diff --git a/test/tools/jmod/JmodTest.java b/test/tools/jmod/JmodTest.java --- a/test/tools/jmod/JmodTest.java +++ b/test/tools/jmod/JmodTest.java @@ -29,6 +29,13 @@ * @modules jdk.compiler * jdk.jlink * @build jdk.test.lib.compiler.CompilerUtils + * jdk.test.lib.util.FileUtils + * 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/othervm -Djava.io.tmpdir=. JmodTest */ diff --git a/test/tools/jmod/hashes/HashesTest.java b/test/tools/jmod/hashes/HashesTest.java --- a/test/tools/jmod/hashes/HashesTest.java +++ b/test/tools/jmod/hashes/HashesTest.java @@ -31,6 +31,8 @@ * jdk.compiler * jdk.jartool * jdk.jlink + * @build jdk.test.lib.compiler.ModuleInfoMaker + * jdk.test.lib.compiler.CompilerUtils * @run testng HashesTest */ diff --git a/test/tools/launcher/LauncherMessageTest.java b/test/tools/launcher/LauncherMessageTest.java --- a/test/tools/launcher/LauncherMessageTest.java +++ b/test/tools/launcher/LauncherMessageTest.java @@ -25,6 +25,13 @@ * @test * @bug 8167063 * @library /test/lib + * @build jdk.test.lib.util.FileUtils + * 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 LauncherMessageTest * @summary LauncherHelper should not throw JNI error for LinkageError */ diff --git a/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java b/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java --- a/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java +++ b/test/tools/launcher/modules/addexports/AddExportsTestWarningError.java @@ -27,7 +27,9 @@ * @summary Basic argument validation for --add-exports * @library /lib/testlibrary /test/lib * @modules jdk.compiler - * @build jdk.testlibrary.* + * @build jdk.test.lib.compiler.ModuleInfoMaker + * jdk.test.lib.compiler.CompilerUtils + * jdk.testlibrary.* * @run testng AddExportsTestWarningError */ diff --git a/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java b/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java --- a/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java +++ b/test/tools/launcher/modules/addreads/AddReadsTestWarningError.java @@ -27,8 +27,10 @@ * @summary Basic argument validation for --add-reads * @library /lib/testlibrary /test/lib * @modules jdk.compiler + * @build jdk.test.lib.compiler.ModuleInfoMaker + * @build jdk.test.lib.compiler.CompilerUtils + * @build jdk.testlibrary.* * @build AddReadsTestWarningError - * @build jdk.testlibrary.* * @run testng AddReadsTestWarningError */ diff --git a/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java b/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java --- a/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java +++ b/test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java @@ -28,6 +28,13 @@ * @library /lib/testlibrary /test/lib * @modules jdk.compiler * @build jdk.test.lib.compiler.CompilerUtils + * jdk.test.lib.util.FileUtils + * 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 PatchSystemModules */