8214431: tests failed because can't find jdk.testlibrary.* in test directory or libraries

Reviewed-by: chegar, ctornqvi, dholmes
2018-11-29 07:40:45 +08:00 · 2018-11-29 07:40:45 +08:00 · 9ed40ce6c5
commit 9ed40ce6c5
parent 53d3a4f50c
13 changed files with 15 additions and 26 deletions
--- a/test/jdk/com/sun/jdi/ProcessAttachTest.java
+++ b/test/jdk/com/sun/jdi/ProcessAttachTest.java
@ -38,11 +38,10 @@ import com.sun.jdi.connect.IllegalConnectorArgumentsException;
 * @bug 4527279
 * @summary Unit test for ProcessAttachingConnector
 *
- * @library /lib/testlibrary
 * @library /test/lib
 * @modules java.management
 *          jdk.jdi
- * @build jdk.testlibrary.* ProcessAttachTest
+ * @build ProcessAttachTest
 * @run driver ProcessAttachTest
 */

--- a/test/jdk/com/sun/tools/attach/BasicTests.java
+++ b/test/jdk/com/sun/tools/attach/BasicTests.java
@ -44,13 +44,12 @@ import com.sun.tools.attach.VirtualMachineDescriptor;
 * @summary Basic unit tests for the VM attach mechanism. This test will perform
 * a number of basic attach tests.
 *
- * @library /lib/testlibrary
 * @library /test/lib
 * @modules java.instrument
 *          jdk.attach
 *          jdk.jartool/sun.tools.jar
 *
- * @run build jdk.testlibrary.* Agent BadAgent RedefineAgent Application RedefineDummy RunnerUtil
+ * @run build Agent BadAgent RedefineAgent Application RedefineDummy RunnerUtil
 * @run main BasicTests
 */
 public class BasicTests {
--- a/test/jdk/com/sun/tools/attach/PermissionTest.java
+++ b/test/jdk/com/sun/tools/attach/PermissionTest.java
@ -34,12 +34,11 @@ import jdk.test.lib.process.ProcessTools;
 * @summary Basic unit tests for the VM attach mechanism. Unit test for Attach
 * API - this checks that a SecurityException is thrown as expected.
 *
- * @library /lib/testlibrary
 * @library /test/lib
 * @modules jdk.attach
 *          jdk.jartool/sun.tools.jar
 *
- * @run build jdk.testlibrary.* Application
+ * @run build Application
 * @run main PermissionTest
 */
 public class PermissionTest {
--- a/test/jdk/com/sun/tools/attach/ProviderTest.java
+++ b/test/jdk/com/sun/tools/attach/ProviderTest.java
@ -33,12 +33,11 @@ import com.sun.tools.attach.spi.AttachProvider;
 * @summary Basic unit tests for the VM attach mechanism. The test will attach
 * and detach to/from the running Application.
 *
- * @library /lib/testlibrary
 * @library /test/lib
 * @modules jdk.attach
 *          jdk.jartool/sun.tools.jar
 *
- * @run build jdk.testlibrary.* SimpleProvider
+ * @run build SimpleProvider
 * @run main ProviderTest
 */
 public class ProviderTest {
--- a/test/jdk/com/sun/tools/attach/TempDirTest.java
+++ b/test/jdk/com/sun/tools/attach/TempDirTest.java
@ -38,12 +38,11 @@ import jdk.test.lib.process.ProcessTools;
 * @bug 8033104
 * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
 *
- * @library /lib/testlibrary
 * @library /test/lib
 * @modules jdk.attach
 *          jdk.jartool/sun.tools.jar
 *
- * @run build jdk.testlibrary.* Application RunnerUtil
+ * @run build Application RunnerUtil
 * @run main/timeout=200 TempDirTest
 */

--- a/test/jdk/java/lang/Thread/ThreadStateTest.java
+++ b/test/jdk/java/lang/Thread/ThreadStateTest.java
@ -30,9 +30,7 @@ import static java.lang.Thread.State.*;
 *          Thread.getState().
 *
 * @author  Mandy Chung
- * @library /lib/testlibrary
 * @library /test/lib
- * @build jdk.testlibrary.*
 * @build jdk.test.lib.LockFreeLogger
 * @build ThreadStateTest ThreadStateController
 * @run main/othervm -Xmixed ThreadStateTest
--- a/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
@ -30,9 +30,9 @@
 *
 * @author  Mandy Chung
 *
- * @library /lib/testlibrary/ /test/lib
+ * @library /test/lib
 * @modules jdk.management
- * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil
+ * @build CollectionUsageThreshold MemoryUtil RunUtil
 * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null"
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
@ -34,10 +34,10 @@
 *
 * @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
 * @requires vm.opt.DisableExplicitGC != "true"
- * @library /lib/testlibrary/ /test/lib
+ * @library /test/lib
 * @modules jdk.management
 *
- * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
+ * @build ResetPeakMemoryUsage MemoryUtil RunUtil
 * @build sun.hotspot.WhiteBox
 * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
 * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. ResetPeakMemoryUsage
--- a/test/jdk/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java
@ -30,10 +30,8 @@
 * @author  Mandy Chung
 *
 * @library ../../Thread
- * @library /lib/testlibrary
 * @library /test/lib
 *
- * @build jdk.testlibrary.*
 * @build ThreadMXBeanStateTest ThreadStateController
 * @run main ThreadMXBeanStateTest
 */
--- a/test/jdk/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java
+++ b/test/jdk/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java
@ -29,9 +29,9 @@ import java.io.IOException;
 * @summary Check SSL config file permission for out-of-the-box management
 * @author Taras Ledkov
 *
- * @library /lib/testlibrary /test/lib
+ * @library /test/lib
 *
- * @build jdk.testlibrary.* jdk.test.lib.Platform AbstractFilePermissionTest Dummy
+ * @build jdk.test.lib.Platform AbstractFilePermissionTest Dummy
 * @run main/timeout=300 PasswordFilePermissionTest
 */
 public class PasswordFilePermissionTest extends AbstractFilePermissionTest {
--- a/test/jdk/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java
+++ b/test/jdk/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java
@ -29,9 +29,9 @@ import java.io.IOException;
 * @summary Check SSL config file permission for out-of-the-box management
 * @author Taras Ledkov
 *
- * @library /lib/testlibrary /test/lib
+ * @library /test/lib
 *
- * @build jdk.testlibrary.* jdk.test.lib.Platform Dummy AbstractFilePermissionTest
+ * @build jdk.test.lib.Platform Dummy AbstractFilePermissionTest
 * @run main/timeout=300 SSLConfigFilePermissionTest
 */
 public class SSLConfigFilePermissionTest extends AbstractFilePermissionTest {
--- a/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
@ -42,10 +42,9 @@ import jdk.test.lib.process.ProcessTools;
 * @summary Makes sure that the current management agent status is reflected
 *          in the related performance counters.
 *
- * @library /lib/testlibrary
 * @library /test/lib
 *
- * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
+ * @build PortAllocator TestApp ManagementAgentJcmd
 * @run testng/othervm -XX:+UsePerfData JMXStatusPerfCountersTest
 */
 public class JMXStatusPerfCountersTest {
--- a/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
@ -38,10 +38,9 @@ import jdk.test.lib.process.ProcessTools;
 *          Management agent may be disabled, started (only local connections) and started.
 *          The test asserts that the expected text is being printed.
 *
- * @library /lib/testlibrary
 * @library /test/lib
 *
- * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
+ * @build PortAllocator TestApp ManagementAgentJcmd
 *        JMXStatusTest JMXStatus1Test JMXStatus2Test
 * @run testng/othervm -XX:+UsePerfData JMXStatus1Test
 * @run testng/othervm -XX:+UsePerfData JMXStatus2Test