8181759: add explicit @build actions for jdk.test.lib classes in all :tier1 tests

Reviewed-by: alanb
2026-05-24 20:38:14 +00:00 · 2017-06-12 12:40:43 -07:00 · 2017-06-12 12:40:43 -07:00 · 1d0a99f1c3
commit 1d0a99f1c3
parent 52270d16cc
48 changed files with 100 additions and 10 deletions
--- a/jdk/test/java/lang/Class/forName/modules/TestDriver.java
+++ b/jdk/test/java/lang/Class/forName/modules/TestDriver.java
@ -43,7 +43,10 @@ import static org.testng.Assert.assertTrue;
 * @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.Platform
+ *        jdk.test.lib.util.FileUtils
+ *        jdk.test.lib.compiler.CompilerUtils
+ *        jdk.testlibrary.ProcessTools
 *        TestDriver TestMain TestLayer
 * @run testng TestDriver
 */
--- a/jdk/test/java/lang/Double/ParseHexFloatingPoint.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Integer/BitTwiddle.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Long/BitTwiddle.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Math/CubeRootTests.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Math/HypotTests.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Math/IeeeRecommendedTests.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Math/Log1pTests.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/Math/MultiplicationTests.java
+++ b/jdk/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)
--- a/jdk/test/java/lang/ProcessHandle/Basic.java
+++ b/jdk/test/java/lang/ProcessHandle/Basic.java
@ -39,6 +39,12 @@ import org.testng.annotations.Test;
 * @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
--- a/jdk/test/java/lang/ProcessHandle/InfoTest.java
+++ b/jdk/test/java/lang/ProcessHandle/InfoTest.java
@ -51,7 +51,12 @@ import org.testng.annotations.Test;
 * @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
--- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java
+++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java
@ -43,7 +43,12 @@ import org.testng.TestNG;
 * @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
--- a/jdk/test/java/lang/ProcessHandle/TreeTest.java
+++ b/jdk/test/java/lang/ProcessHandle/TreeTest.java
@ -48,6 +48,11 @@ import org.testng.annotations.Test;
 * @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
--- a/jdk/test/java/lang/StackTraceElement/WithClassLoaderName.java
+++ b/jdk/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
 */
--- a/jdk/test/java/lang/StackWalker/StackWalkTest.java
+++ b/jdk/test/java/lang/StackWalker/StackWalkTest.java
@ -38,6 +38,7 @@ import jdk.test.lib.RandomFactory;
 * @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
--- a/jdk/test/java/lang/StrictMath/CubeRootTests.java
+++ b/jdk/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
--- a/jdk/test/java/lang/StrictMath/ExpTests.java
+++ b/jdk/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
--- a/jdk/test/java/lang/StrictMath/HypotTests.java
+++ b/jdk/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
--- a/jdk/test/java/lang/String/CompactString/SerializationTest.java
+++ b/jdk/test/java/lang/String/CompactString/SerializationTest.java
@ -31,6 +31,7 @@ import static org.testng.Assert.assertEquals;
 * @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
--- a/jdk/test/java/lang/String/LiteralReplace.java
+++ b/jdk/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
--- a/jdk/test/java/lang/StringBuffer/CompactStringBufferSerialization.java
+++ b/jdk/test/java/lang/StringBuffer/CompactStringBufferSerialization.java
@ -33,6 +33,7 @@ import static org.testng.Assert.*;
 * @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
--- a/jdk/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java
+++ b/jdk/test/java/lang/StringBuilder/CompactStringBuilderSerialization.java
@ -33,6 +33,7 @@ import static org.testng.Assert.*;
 * @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
--- a/jdk/test/java/lang/Thread/ThreadStateTest.java
+++ b/jdk/test/java/lang/Thread/ThreadStateTest.java
@ -33,6 +33,7 @@ import static java.lang.Thread.State.*;
 * @library /lib/testlibrary
 * @library /test/lib
 * @build jdk.testlibrary.*
+ * @build jdk.test.lib.LockFreeLogger
 * @build ThreadStateTest ThreadStateController
 * @run main/othervm -Xmixed ThreadStateTest
 */
--- a/jdk/test/java/lang/invoke/LFCaching/LFGarbageCollectedTest.java
+++ b/jdk/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
--- a/jdk/test/java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java
+++ b/jdk/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
--- a/jdk/test/java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java
+++ b/jdk/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
--- a/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java
+++ b/jdk/test/java/lang/invoke/MethodHandles/CatchExceptionTest.java
@ -44,6 +44,7 @@ import java.util.function.Supplier;

 /* @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
--- a/jdk/test/java/lang/ref/CleanerTest.java
+++ b/jdk/test/java/lang/ref/CleanerTest.java
@ -51,7 +51,12 @@ import org.testng.annotations.Test;
 * @test
 * @library /lib/testlibrary /test/lib
 * @build sun.hotspot.WhiteBox
- * @build jdk.test.lib.Utils
+ *        jdk.test.lib.Utils
+ *        jdk.test.lib.Asserts
+ *        jdk.test.lib.JDKToolFinder
+ *        jdk.test.lib.JDKToolLauncher
+ *        jdk.test.lib.Platform
+ *        jdk.test.lib.process.*
 * @modules java.base/jdk.internal
 *          java.base/jdk.internal.misc
 *          java.base/jdk.internal.ref
--- a/jdk/test/java/math/BigDecimal/StringConstructor.java
+++ b/jdk/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).
--- a/jdk/test/java/math/BigInteger/BigIntegerTest.java
+++ b/jdk/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)
--- a/jdk/test/java/math/BigInteger/ModPow65537.java
+++ b/jdk/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)
--- a/jdk/test/java/math/BigInteger/PrimeTest.java
+++ b/jdk/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)
--- a/jdk/test/java/nio/Buffer/LimitDirectMemoryNegativeTest.java
+++ b/jdk/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
--- a/jdk/test/java/util/Base64/TestBase64.java
+++ b/jdk/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
 */
--- a/jdk/test/java/util/List/SubList.java
+++ b/jdk/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
--- a/jdk/test/java/util/WeakHashMap/GCDuringIteration.java
+++ b/jdk/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.
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java
+++ b/jdk/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
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
+++ b/jdk/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
 */

--- a/jdk/test/java/util/logging/FileHandlerMaxLocksTest.java
+++ b/jdk/test/java/util/logging/FileHandlerMaxLocksTest.java
@ -29,6 +29,8 @@
 *  "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.util.FileUtils
 * @author rpatil
 * @run main/othervm FileHandlerMaxLocksTest
 */
--- a/jdk/test/java/util/regex/RegExTest.java
+++ b/jdk/test/java/util/regex/RegExTest.java
@ -38,6 +38,7 @@
 * 8176029
 *
 * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
 * @run main RegExTest
 * @key randomness
 */
--- a/jdk/test/java/util/zip/InflaterInputStream/TestAvailable.java
+++ b/jdk/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.
--- a/jdk/test/java/util/zip/ZipFile/MultiThreadedReadTest.java
+++ b/jdk/test/java/util/zip/ZipFile/MultiThreadedReadTest.java
@ -25,6 +25,8 @@
 * @bug 8038491
 * @summary Crash in ZipFile.read() when ZipFileInputStream is shared between threads
 * @library /test/lib
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
 * @run main MultiThreadedReadTest
 * @key randomness
 */
--- a/jdk/test/java/util/zip/ZipFile/ReadLongZipFileName.java
+++ b/jdk/test/java/util/zip/ZipFile/ReadLongZipFileName.java
@ -25,6 +25,9 @@
 * @test
 * @bug 6374379
 * @library /test/lib
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
+ * @run main ReadLongZipFileName
 * @summary Verify that we can read zip file names > 255 chars long
 */

--- a/jdk/test/java/util/zip/ZipFile/ZipEntryFreeTest.java
+++ b/jdk/test/java/util/zip/ZipFile/ZipEntryFreeTest.java
@ -25,6 +25,8 @@
 * @bug 6907252
 * @summary ZipFileInputStream Not Thread-Safe
 * @library /test/lib
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
 * @run main ZipEntryFreeTest
 */

--- a/jdk/test/jdk/internal/ref/Cleaner/ExitOnThrow.java
+++ b/jdk/test/jdk/internal/ref/Cleaner/ExitOnThrow.java
@ -27,8 +27,12 @@
 * @library /test/lib
 * @modules java.base/jdk.internal.ref
 *          java.base/jdk.internal.misc
- * @build jdk.test.lib.*
- * @build jdk.test.lib.process.*
+ * @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 ExitOnThrow
 * @summary Ensure that if a cleaner throws an exception then the VM exits
 */
--- a/jdk/test/jdk/internal/util/jar/TestVersionedStream.java
+++ b/jdk/test/jdk/internal/util/jar/TestVersionedStream.java
@ -27,6 +27,8 @@
 * @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.util.FileUtils
 * @run testng TestVersionedStream
 */

--- a/jdk/test/jdk/modules/incubator/ImageModules.java
+++ b/jdk/test/jdk/modules/incubator/ImageModules.java
@ -28,7 +28,9 @@
 * @library /lib/testlibrary /test/lib
 * @key intermittent
 * @modules jdk.compiler jdk.jartool jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
+ *        jdk.test.lib.compiler.CompilerUtils
 * @run testng/othervm ImageModules
 */

--- a/jdk/test/sun/misc/SunMiscSignalTest.java
+++ b/jdk/test/sun/misc/SunMiscSignalTest.java
@ -46,7 +46,12 @@ import sun.misc.SignalHandler;
 * @library /test/lib
 * @modules jdk.unsupported
 *          java.base/jdk.internal.misc
- * @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/othervm -Xrs -DXrs=true SunMiscSignalTest
 * @run testng/othervm SunMiscSignalTest
 * @summary sun.misc.Signal test