test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java

@@ -19,30 +19,38 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-import sun.hotspot.WhiteBox;
-
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-
 /*
  * @test MethodUnloadingTest
  * @bug 8029443
- * @summary "Tests the unloading of methods to to class unloading"
+ * @summary Tests the unloading of methods to to class unloading
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build TestMethodUnloading
- * @build WorkerClass
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @library /testlibrary /test/lib /
+ *
+ * @build compiler.classUnloading.methodUnloading.TestMethodUnloading
+ *        compiler.classUnloading.methodUnloading.WorkerClass
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-BackgroundCompilation -XX:-UseCompressedOops -XX:CompileOnly=TestMethodUnloading::doWork TestMethodUnloading
+ * @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *                   -XX:-BackgroundCompilation -XX:-UseCompressedOops
+ *                   -XX:CompileCommand=compileonly,compiler.classUnloading.methodUnloading.TestMethodUnloading::doWork
+ *                   compiler.classUnloading.methodUnloading.TestMethodUnloading
  */
+
+package compiler.classUnloading.methodUnloading;
+
+import sun.hotspot.WhiteBox;
+
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
 public class TestMethodUnloading {
-    private static final String workerClassName = "WorkerClass";
+    private static final String workerClassName = "compiler.classUnloading.methodUnloading.WorkerClass";
     private static int work = -1;
 
     private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
     private static int COMP_LEVEL_SIMPLE = 1;
     private static int COMP_LEVEL_FULL_OPTIMIZATION = 4;