# HG changeset patch
# User mfang
# Date 1383085924 25200
# Node ID 4071c853edff590f4d261d12acedc8d010752a5f
# Parent  8cfc73ad9f3107a0637a36ada867773e62ff8a04# Parent  a3ac9c0b19a9efe9abd2137d08d34f254ee89084
Merge

diff -r 8cfc73ad9f31 -r 4071c853edff test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
--- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Tue Oct 29 15:31:07 2013 -0700
+++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Tue Oct 29 15:32:04 2013 -0700
@@ -35,7 +35,7 @@
 /**
  * @test
  * @bug 6434402 8004926
- * @library ../../../../lib/testlibrary
+ * @library /lib/testlibrary
  * @build TestManager TestApplication CustomLauncherTest
  * @run main CustomLauncherTest
  * @author Jaroslav Bachorik
diff -r 8cfc73ad9f31 -r 4071c853edff test/sun/management/jmxremote/bootstrap/LocalManagementTest.java
--- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Tue Oct 29 15:31:07 2013 -0700
+++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java	Tue Oct 29 15:32:04 2013 -0700
@@ -35,7 +35,7 @@
 
 /**
  * @test
- * @library ../../../../lib/testlibrary
+ * @library /lib/testlibrary
  * @bug 5016507 6173612 6319776 6342019 6484550 8004926
  * @summary Start a managed VM and test that a management tool can connect
  *          without connection or username/password details.
@@ -108,6 +108,8 @@
                 "=com.sun.management.jmxremote.port=7775," +
                 "com.sun.management.jmxremote.authenticate=false," +
                 "com.sun.management.jmxremote.ssl=false",
+                "-cp",
+                TEST_CLASSES,
                 "TestApplication",
                 "-exit"
             );
@@ -160,6 +162,9 @@
 
     private static boolean doTest(String arg) throws Exception {
         List<String> args = new ArrayList<>();
+        args.add("-cp");
+        args.add(TEST_CLASSES);
+
         if (arg != null) {
             args.add(arg);
         }