# HG changeset patch
# User iignatyev
# Date 1496284823 25200
#      Wed May 31 19:40:23 2017 -0700
# Node ID 96c3b7d8131f3023c6d7d7aa521a12201c104b62
# Parent  c95feefeb563b77fc9077f2845aaa5291fe96d65
8181391: remove explicit @build actions for the top level testlibary classes
Reviewed-by: duke

diff --git a/test/com/sun/corba/serialization/ObjectStreamTest.java b/test/com/sun/corba/serialization/ObjectStreamTest.java
--- a/test/com/sun/corba/serialization/ObjectStreamTest.java
+++ b/test/com/sun/corba/serialization/ObjectStreamTest.java
@@ -61,7 +61,6 @@
 /*
  * @test
  * @library /test/lib
- * @build jdk.test.lib.*
  * @compile ObjectStreamTest.java  ObjectStreamTest$_Echo_Stub.java
  *          ObjectStreamTest$_Server_Tie.java
  * @modules java.base/java.io:open
diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java b/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java
@@ -40,10 +40,6 @@
  * @library /lib/testlibrary
  * @library /test/lib
  * @build jdk.testlibrary.*
- * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.model.*
- * @build jdk.test.lib.hprof.parser.*
- * @build jdk.test.lib.hprof.util.*
  * @run main DumpHeap
  */
 public class DumpHeap {
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,6 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
- * @build jdk.test.lib.Platform jdk.test.lib.Utils
  * @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,6 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
- * @build jdk.test.lib.Platform jdk.test.lib.Utils
  * @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
@@ -47,7 +47,6 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
- * @build jdk.test.lib.Utils
  * @run testng/othervm TreeTest
  * @summary Test counting and JavaChild.spawning and counting of Processes.
  * @author Roger Riggs
diff --git a/test/java/lang/ref/CleanerTest.java b/test/java/lang/ref/CleanerTest.java
--- a/test/java/lang/ref/CleanerTest.java
+++ b/test/java/lang/ref/CleanerTest.java
@@ -49,9 +49,8 @@
 
 /*
  * @test
- * @library /lib/testlibrary /test/lib
+ * @library /test/lib
  * @build sun.hotspot.WhiteBox
- * @build jdk.test.lib.Utils
  * @modules java.base/jdk.internal
  *          java.base/jdk.internal.misc
  *          java.base/jdk.internal.ref
diff --git a/test/java/net/InetAddress/ptr/Lookup.java b/test/java/net/InetAddress/ptr/Lookup.java
--- a/test/java/net/InetAddress/ptr/Lookup.java
+++ b/test/java/net/InetAddress/ptr/Lookup.java
@@ -28,9 +28,6 @@
  * @summary Test that reverse lookups of IPv4 addresses work when IPv6
  *          is enabled
  * @library /test/lib
- * @build jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.process.OutputAnalyzer
- *        Lookup
  * @run main Lookup root
  *
  */
diff --git a/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java b/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
--- a/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
+++ b/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
@@ -30,9 +30,6 @@
  *          can cause fd leak
  * @requires (os.family != "windows")
  * @library /test/lib
- * @build jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.process.OutputAnalyzer
- *        AcceptCauseFileDescriptorLeak
  * @run main/othervm AcceptCauseFileDescriptorLeak root
  */
 
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,6 @@
  * @test
  * @bug 6449565
  * @library /test/lib
- * @build jdk.test.lib.process.ProcessTools
  * @run main OldSocketImplTestDriver
  * @summary Test driver for OdlSocketImpl
  */
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,9 +26,6 @@
  * @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
- *        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,6 @@
  * @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
  * @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,9 +27,6 @@
  * @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
- *        Test
  * @run main/othervm TestDriver
  */
 
diff --git a/test/jdk/internal/ref/Cleaner/ExitOnThrow.java b/test/jdk/internal/ref/Cleaner/ExitOnThrow.java
--- a/test/jdk/internal/ref/Cleaner/ExitOnThrow.java
+++ b/test/jdk/internal/ref/Cleaner/ExitOnThrow.java
@@ -27,8 +27,6 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.ref
  *          java.base/jdk.internal.misc
- * @build jdk.test.lib.*
- * @build jdk.test.lib.process.*
  * @run main ExitOnThrow
  * @summary Ensure that if a cleaner throws an exception then the VM exits
  */
diff --git a/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java b/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java
--- a/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java
+++ b/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java
@@ -45,7 +45,6 @@
  * @library /test/lib
  *
  * @build jdk.testlibrary.*
- * @build jdk.test.lib.apps.*
  * @run main TestPollingInterval
  */
 public class TestPollingInterval {
diff --git a/test/sun/misc/SunMiscSignalTest.java b/test/sun/misc/SunMiscSignalTest.java
--- a/test/sun/misc/SunMiscSignalTest.java
+++ b/test/sun/misc/SunMiscSignalTest.java
@@ -46,7 +46,6 @@
  * @library /test/lib
  * @modules jdk.unsupported
  *          java.base/jdk.internal.misc
- * @build jdk.test.lib.Platform jdk.test.lib.Utils
  * @run testng/othervm -Xrs -DXrs=true SunMiscSignalTest
  * @run testng/othervm SunMiscSignalTest
  * @summary sun.misc.Signal test
diff --git a/test/sun/tools/jhsdb/BasicLauncherTest.java b/test/sun/tools/jhsdb/BasicLauncherTest.java
--- a/test/sun/tools/jhsdb/BasicLauncherTest.java
+++ b/test/sun/tools/jhsdb/BasicLauncherTest.java
@@ -27,7 +27,6 @@
  * @library /test/lib
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
- * @build jdk.test.lib.apps.*
  * @run main BasicLauncherTest
  */
 
diff --git a/test/sun/tools/jmap/BasicJMapTest.java b/test/sun/tools/jmap/BasicJMapTest.java
--- a/test/sun/tools/jmap/BasicJMapTest.java
+++ b/test/sun/tools/jmap/BasicJMapTest.java
@@ -39,10 +39,6 @@
  * @library /lib/testlibrary
  * @library /test/lib
  * @build jdk.testlibrary.*
- * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.model.*
- * @build jdk.test.lib.hprof.parser.*
- * @build jdk.test.lib.hprof.util.*
  * @run main/timeout=240 BasicJMapTest
  */
 public class BasicJMapTest {
diff --git a/test/sun/tools/jps/TestJpsSanity.java b/test/sun/tools/jps/TestJpsSanity.java
--- a/test/sun/tools/jps/TestJpsSanity.java
+++ b/test/sun/tools/jps/TestJpsSanity.java
@@ -33,7 +33,7 @@
  * @modules jdk.jartool/sun.tools.jar
  *          java.management
  *          java.base/jdk.internal.misc
- * @build jdk.testlibrary.* jdk.test.lib.apps.* JpsHelper
+ * @build jdk.testlibrary.* JpsHelper
  * @run driver TestJpsSanity
  */
 public class TestJpsSanity {
diff --git a/test/sun/tools/jstack/DeadlockDetectionTest.java b/test/sun/tools/jstack/DeadlockDetectionTest.java
--- a/test/sun/tools/jstack/DeadlockDetectionTest.java
+++ b/test/sun/tools/jstack/DeadlockDetectionTest.java
@@ -40,8 +40,6 @@
  * @library /test/lib
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
- * @build jdk.test.lib.apps.*
- * @build DeadlockDetectionTest
  * @run main DeadlockDetectionTest
  */
 public class DeadlockDetectionTest {
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,7 +27,6 @@
  * @modules java.base/jdk.internal.misc
  *          jdk.compiler
  *          jdk.jartool
- * @build jdk.test.lib.JDKToolFinder jdk.test.lib.Utils
  * @build MRTestBase
  * @run testng Basic1
  */
diff --git a/test/tools/jimage/JImageBasicsTest.java b/test/tools/jimage/JImageBasicsTest.java
--- a/test/tools/jimage/JImageBasicsTest.java
+++ b/test/tools/jimage/JImageBasicsTest.java
@@ -26,7 +26,6 @@
  * @summary Tests to verify jimage basic options, i.e. --version, -h
  * @library /test/lib
  * @modules jdk.jlink/jdk.tools.jimage
- * @build jdk.test.lib.Asserts
  * @run main JImageBasicsTest
  */
 
diff --git a/test/tools/jimage/JImageExtractTest.java b/test/tools/jimage/JImageExtractTest.java
--- a/test/tools/jimage/JImageExtractTest.java
+++ b/test/tools/jimage/JImageExtractTest.java
@@ -26,7 +26,6 @@
  * @summary Tests to verify jimage 'extract' action
  * @library /test/lib
  * @modules jdk.jlink/jdk.tools.jimage
- * @build jdk.test.lib.Asserts
  * @run main/othervm JImageExtractTest
  */
 
diff --git a/test/tools/jimage/JImageInfoTest.java b/test/tools/jimage/JImageInfoTest.java
--- a/test/tools/jimage/JImageInfoTest.java
+++ b/test/tools/jimage/JImageInfoTest.java
@@ -26,7 +26,6 @@
  * @summary Tests to verify jimage 'info' action
  * @library /test/lib
  * @modules jdk.jlink/jdk.tools.jimage
- * @build jdk.test.lib.Asserts
  * @run main JImageInfoTest
  */
 
diff --git a/test/tools/jimage/JImageListTest.java b/test/tools/jimage/JImageListTest.java
--- a/test/tools/jimage/JImageListTest.java
+++ b/test/tools/jimage/JImageListTest.java
@@ -26,7 +26,6 @@
  * @summary Tests to verify jimage 'list' action
  * @library /test/lib
  * @modules jdk.jlink/jdk.tools.jimage
- * @build jdk.test.lib.Asserts
  * @run main JImageListTest
  */
 
diff --git a/test/tools/jimage/JImageVerifyTest.java b/test/tools/jimage/JImageVerifyTest.java
--- a/test/tools/jimage/JImageVerifyTest.java
+++ b/test/tools/jimage/JImageVerifyTest.java
@@ -26,7 +26,6 @@
  * @summary Tests to verify jimage 'verify' action
  * @library /test/lib
  * @modules jdk.jlink/jdk.tools.jimage
- * @build jdk.test.lib.Asserts
  * @run main JImageVerifyTest
  */
 
diff --git a/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java b/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
--- a/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
+++ b/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
@@ -29,7 +29,6 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.jimage
  *          java.base/jdk.internal.module
- * @build jdk.test.lib.process.*
  * @run testng JLinkMultiReleaseJarTest
 */
 
diff --git a/test/tools/schemagen/MultiReleaseJarTest.java b/test/tools/schemagen/MultiReleaseJarTest.java
--- a/test/tools/schemagen/MultiReleaseJarTest.java
+++ b/test/tools/schemagen/MultiReleaseJarTest.java
@@ -27,11 +27,7 @@
  * @library /test/lib
  * @library /lib/testlibrary
  * @modules jdk.compiler java.xml.ws
- * @build jdk.test.lib.JDKToolFinder jdk.test.lib.JDKToolLauncher
- *        jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- *        jdk.test.lib.Utils
- *        CompilerUtils MultiReleaseJarTest
+ * @build CompilerUtils
  * @run testng MultiReleaseJarTest
  */
 
@@ -114,4 +110,4 @@
                     "--add-modules", "java.xml.ws"));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/tools/wsgen/MultiReleaseJarTest.java b/test/tools/wsgen/MultiReleaseJarTest.java
--- a/test/tools/wsgen/MultiReleaseJarTest.java
+++ b/test/tools/wsgen/MultiReleaseJarTest.java
@@ -27,11 +27,7 @@
  * @library /test/lib
  * @library /lib/testlibrary
  * @modules jdk.compiler java.xml.ws
- * @build jdk.test.lib.JDKToolFinder jdk.test.lib.JDKToolLauncher
- *        jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- *        jdk.test.lib.Utils
- *        CompilerUtils MultiReleaseJarTest
+ * @build CompilerUtils
  * @run testng MultiReleaseJarTest
  */
 
@@ -117,4 +113,5 @@
                     "--add-modules", "java.xml.ws"));
         }
     }
-}
\ No newline at end of file
+}
+