Thanks Erik!
Staffan, could you please be my sponsor and push the change?
// Katja
On 05/22/2014 11:02 AM, Erik Gahlin wrote:
Looks good!
Erik
Yekaterina Kantserova skrev 2014-05-20 15:48:
Thanks Staffan!
New webrev can be found here:
http://cr.openjdk.java.net/~ykantser/8043520/webrev.01/
// Katja
On 05/20/2014 03:07 PM, Staffan Larsen wrote:
test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java
“Dummy” is being built twice.
Otherwise good!
/Staffan
On 20 maj 2014, at 14:24, Yekaterina Kantserova
<yekaterina.kantser...@oracle.com> wrote:
Staffan, Alan,
could you please review the following fix.
Bug: https://bugs.openjdk.java.net/browse/JDK-8043520
Webrev: http://cr.openjdk.java.net/~ykantser/8043520/webrev.00/
I've missed somehow several tests in
http://cr.openjdk.java.net/~ykantser/8034960/webrev.01/ which
existed in http://cr.openjdk.java.net/~ykantser/8034960/webrev.00/.
Thanks,
Katja
# HG changeset patch
# User ykantser
# Date 1400749536 -7200
# Node ID b81e5cefbee48c41350343e94ed807d4ee6c5292
# Parent 5b45a5efe417d0420ad29c2467247740a84064d2
8043520: Serviceability tests using @library failing with java.lang.NoClassDefFoundError
Reviewed-by: sla, egahlin
diff --git a/test/com/sun/jdi/BadHandshakeTest.java b/test/com/sun/jdi/BadHandshakeTest.java
--- a/test/com/sun/jdi/BadHandshakeTest.java
+++ b/test/com/sun/jdi/BadHandshakeTest.java
@@ -26,7 +26,7 @@
* @summary Check that a bad handshake doesn't cause a debuggee to abort
* @library /lib/testlibrary
*
- * @build VMConnection BadHandshakeTest Exit0
+ * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
* @run main BadHandshakeTest
*
*/
diff --git a/test/com/sun/jdi/ExclusiveBind.java b/test/com/sun/jdi/ExclusiveBind.java
--- a/test/com/sun/jdi/ExclusiveBind.java
+++ b/test/com/sun/jdi/ExclusiveBind.java
@@ -27,8 +27,7 @@
* at the same time.
* @library /lib/testlibrary
*
- * @build jdk.testlibrary.ProcessTools jdk.testlibrary.JDKToolLauncher jdk.testlibrary.Utils
- * @build VMConnection ExclusiveBind HelloWorld
+ * @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld
* @run main ExclusiveBind
*/
import java.net.ServerSocket;
diff --git a/test/com/sun/tools/attach/TempDirTest.java b/test/com/sun/tools/attach/TempDirTest.java
--- a/test/com/sun/tools/attach/TempDirTest.java
+++ b/test/com/sun/tools/attach/TempDirTest.java
@@ -38,7 +38,7 @@
* @bug 8033104
* @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
* @library /lib/testlibrary
- * @run build Application Shutdown RunnerUtil
+ * @run build jdk.testlibrary.* Application Shutdown RunnerUtil
* @run main TempDirTest
*/
diff --git a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java
--- a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java
+++ b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java
@@ -26,7 +26,7 @@
* @summary Assert in java.lang.instrument agents during shutdown when classloading occurs after shutdown
* @library /lib/testlibrary
*
- * @build DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread
+ * @build jdk.testlibrary.* DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread
* @run shell ../MakeJAR3.sh DummyAgent
* @run main TestDaemonThreadLauncher /timeout=240
*
diff --git a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
--- a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
+++ b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
@@ -33,7 +33,7 @@
* @author Mandy Chung
*
* @library /lib/testlibrary/
- * @build ResetPeakMemoryUsage MemoryUtil RunUtil
+ * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
* @run main ResetPeakMemoryUsage
*/
diff --git a/test/sun/management/jdp/JdpDefaultsTest.java b/test/sun/management/jdp/JdpDefaultsTest.java
--- a/test/sun/management/jdp/JdpDefaultsTest.java
+++ b/test/sun/management/jdp/JdpDefaultsTest.java
@@ -28,7 +28,7 @@
* @test JdpDefaultsTest
* @summary Assert that we can read JDP packets from a multicast socket connection, on default IP and port.
* @library /lib/testlibrary
- * @build ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
+ * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
* @run main JdpDefaultsTest
*/
diff --git a/test/sun/management/jdp/JdpOffTest.java b/test/sun/management/jdp/JdpOffTest.java
--- a/test/sun/management/jdp/JdpOffTest.java
+++ b/test/sun/management/jdp/JdpOffTest.java
@@ -29,7 +29,7 @@
* @test JdpOffTest.java
* @summary Assert that no JDP packets are sent to the default address and port.
* @library /lib/testlibrary
- * @build ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher
+ * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher
* @run main JdpOffTest
*/
diff --git a/test/sun/management/jdp/JdpSpecificAddressTest.java b/test/sun/management/jdp/JdpSpecificAddressTest.java
--- a/test/sun/management/jdp/JdpSpecificAddressTest.java
+++ b/test/sun/management/jdp/JdpSpecificAddressTest.java
@@ -28,7 +28,7 @@
* @test JdpSpecificAddressTest
* @summary Assert that we can read JDP packets from a multicast socket connection, on specific IP and port.
* @library /lib/testlibrary
- * @build ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
+ * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
* @run main JdpSpecificAddressTest
*/
diff --git a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
--- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
+++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
@@ -42,9 +42,7 @@
* without connection or username/password details.
* TestManager will attempt a connection to the address obtained from
* both agent properties and jvmstat buffer.
- * @build jdk.testlibrary.ProcessTools
- * @build jdk.testlibrary.Utils
- * @build TestManager TestApplication
+ * @build jdk.testlibrary.* TestManager TestApplication
* @run main/othervm/timeout=300 -XX:+UsePerfData LocalManagementTest
*/
diff --git a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java
--- a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java
+++ b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java
@@ -28,11 +28,7 @@
* @library /lib/testlibrary
* @bug 6557093
* @summary Check SSL config file permission for out-of-the-box management
- * @build jdk.testlibrary.Utils
- * @build jdk.testlibrary.ProcessTools
- * @build jdk.testlibrary.OutputAnalyzer
- * @build AbstractFilePermissionTest
- * @build Dummy
+ * @build jdk.testlibrary.* AbstractFilePermissionTest Dummy
* @run main/timeout=300 PasswordFilePermissionTest
*
* @author Taras Ledkov
diff --git a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh
--- a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh
+++ b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh
@@ -27,11 +27,7 @@
# @summary Test RMI Bootstrap
#
# @library /lib/testlibrary
-# @library /lib/testlibrary
-# @build jdk.testlibrary.Utils
-# @build TestLogger
-# @build Utils
-# @build RmiBootstrapTest
+# @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest
# @run shell/timeout=300 RmiBootstrapTest.sh
# Define the Java class test name
diff --git a/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java b/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java
--- a/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java
+++ b/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java
@@ -42,10 +42,7 @@
* @library /lib/testlibrary
* @bug 6228231
* @summary Test that RMI registry uses SSL.
- * @build jdk.testlibrary.Utils
- * @build jdk.testlibrary.ProcessTools
- * @build jdk.testlibrary.OutputAnalyzer
- * @build RmiRegistrySslTestApp
+ * @build jdk.testlibrary.* RmiRegistrySslTestApp
* @run main/timeout=300 RmiRegistrySslTest
* @author Luis-Miguel Alventosa, Taras Ledkov
*/
diff --git a/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh b/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh
--- a/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh
+++ b/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh
@@ -27,10 +27,7 @@
# @summary Test RMI Bootstrap with SSL
#
# @library /lib/testlibrary
-# @build jdk.testlibrary.Utils
-# @build TestLogger
-# @build Utils
-# @build RmiBootstrapTest
+# @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest
# @run shell/timeout=300 RmiSslBootstrapTest.sh
# Define the Java class test name
diff --git a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java
--- a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java
+++ b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java
@@ -27,12 +27,7 @@
* @test
* @library /lib/testlibrary
* @bug 6557093
- * @bug 6557093
- * @build jdk.testlibrary.Utils
- * @build jdk.testlibrary.ProcessTools
- * @build jdk.testlibrary.OutputAnalyzer
- * @build Dummy
- * @build AbstractFilePermissionTest
+ * @build jdk.testlibrary.* Dummy AbstractFilePermissionTest
* @summary Check SSL config file permission for out-of-the-box management
* @run main/timeout=300 SSLConfigFilePermissionTest
*
diff --git a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
--- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
+++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
@@ -54,10 +54,7 @@
* @test
* @bug 7110104
* @library /lib/testlibrary
- * @build jdk.testlibrary.ProcessTools
- * @build jdk.testlibrary.JDKToolLauncher
- * @build jdk.testlibrary.Utils
- * @build JMXStartStopTest JMXStartStopDoSomething
+ * @build jdk.testlibrary.* JMXStartStopTest JMXStartStopDoSomething
* @run main/othervm JMXStartStopTest
* @summary Makes sure that enabling/disabling the management agent through
* JCMD achieves the desired results
diff --git a/test/sun/tools/jstat/JStatInterval.java b/test/sun/tools/jstat/JStatInterval.java
--- a/test/sun/tools/jstat/JStatInterval.java
+++ b/test/sun/tools/jstat/JStatInterval.java
@@ -28,8 +28,7 @@
* @summary Test checks case when target application finishes execution and jstat didn't complete work.
jstat is started with interval = 100 (jstat -compiler 100) and monitored application finishes
after 500ms. This shouldn't cause crash or hang in target application or in jstat.
- * @build jdk.testlibrary.ProcessTools jdk.testlibrary.JDKToolLauncher
- * @build JStatInterval
+ * @build jdk.testlibrary.* JStatInterval
* @run main JStatInterval
*/
diff --git a/test/sun/tools/jstatd/TestJstatdDefaults.java b/test/sun/tools/jstatd/TestJstatdDefaults.java
--- a/test/sun/tools/jstatd/TestJstatdDefaults.java
+++ b/test/sun/tools/jstatd/TestJstatdDefaults.java
@@ -25,7 +25,7 @@
* @test
* @bug 4990825
* @library /lib/testlibrary
- * @build JstatdTest JstatGCUtilParser
+ * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
* @run main/timeout=60 TestJstatdDefaults
*/
public class TestJstatdDefaults {
diff --git a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java
--- a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java
+++ b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java
@@ -25,7 +25,7 @@
* @test
* @bug 4990825 7092186
* @library /lib/testlibrary
- * @build JstatdTest JstatGCUtilParser
+ * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
* @run main/timeout=60 TestJstatdExternalRegistry
*/
public class TestJstatdExternalRegistry {
diff --git a/test/sun/tools/jstatd/TestJstatdPort.java b/test/sun/tools/jstatd/TestJstatdPort.java
--- a/test/sun/tools/jstatd/TestJstatdPort.java
+++ b/test/sun/tools/jstatd/TestJstatdPort.java
@@ -25,7 +25,7 @@
* @test
* @bug 4990825
* @library /lib/testlibrary
- * @build JstatdTest JstatGCUtilParser
+ * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
* @run main/timeout=60 TestJstatdPort
*/
public class TestJstatdPort {
diff --git a/test/sun/tools/jstatd/TestJstatdPortAndServer.java b/test/sun/tools/jstatd/TestJstatdPortAndServer.java
--- a/test/sun/tools/jstatd/TestJstatdPortAndServer.java
+++ b/test/sun/tools/jstatd/TestJstatdPortAndServer.java
@@ -25,7 +25,7 @@
* @test
* @bug 4990825
* @library /lib/testlibrary
- * @build JstatdTest JstatGCUtilParser
+ * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
* @run main/timeout=60 TestJstatdPortAndServer
*/
public class TestJstatdPortAndServer {
diff --git a/test/sun/tools/jstatd/TestJstatdServer.java b/test/sun/tools/jstatd/TestJstatdServer.java
--- a/test/sun/tools/jstatd/TestJstatdServer.java
+++ b/test/sun/tools/jstatd/TestJstatdServer.java
@@ -25,7 +25,7 @@
* @test
* @bug 4990825
* @library /lib/testlibrary
- * @build JstatdTest JstatGCUtilParser
+ * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
* @run main/timeout=60 TestJstatdServer
*/
public class TestJstatdServer {
diff --git a/test/sun/tools/jstatd/TestJstatdUsage.java b/test/sun/tools/jstatd/TestJstatdUsage.java
--- a/test/sun/tools/jstatd/TestJstatdUsage.java
+++ b/test/sun/tools/jstatd/TestJstatdUsage.java
@@ -28,7 +28,7 @@
* @test
* @bug 4990825
* @library /lib/testlibrary
- * @build jdk.testlibrary.JDKToolLauncher jdk.testlibrary.OutputAnalyzer
+ * @build jdk.testlibrary.*
* @run main TestJstatdUsage
*/
public class TestJstatdUsage {
