--- a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java Tue Jul 12 08:42:46 2016 +0000
+++ b/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java Tue Jul 12 18:24:48 2016 +0300
@@ -20,8 +20,6 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-import java.io.PrintWriter;
-import jdk.test.lib.*;
/*
* @test
@@ -30,21 +28,37 @@
* @modules java.base/jdk.internal.misc
* java.instrument
* java.management
- * @build Agent Test A B
- * @run main ClassFileInstaller Agent
- * @run main Launcher
- * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222 -XX:ReservedCodeCacheSize=3M Agent
+ * @build compiler.profiling.spectrapredefineclass_classloaders.Agent
+ * compiler.profiling.spectrapredefineclass_classloaders.Test
+ * compiler.profiling.spectrapredefineclass_classloaders.A
+ * compiler.profiling.spectrapredefineclass_classloaders.B
+ * @run driver ClassFileInstaller compiler.profiling.spectrapredefineclass_classloaders.Agent
+ * @run driver compiler.profiling.spectrapredefineclass_classloaders.Launcher
+ * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation
+ * -XX:-UseOnStackReplacement -XX:TypeProfileLevel=222
+ * -XX:ReservedCodeCacheSize=3M
+ * compiler.profiling.spectrapredefineclass_classloaders.Agent
*/
-public class Launcher {
- public static void main(String[] args) throws Exception {
+package compiler.profiling.spectrapredefineclass_classloaders;
+
+import jdk.test.lib.JDKToolFinder;
- PrintWriter pw = new PrintWriter("MANIFEST.MF");
- pw.println("Agent-Class: Agent");
- pw.println("Can-Retransform-Classes: true");
- pw.close();
+import java.io.File;
+import java.io.PrintWriter;
+
+public class Launcher {
+ public static void main(String[] args) throws Exception {
+
+ PrintWriter pw = new PrintWriter("MANIFEST.MF");
- ProcessBuilder pb = new ProcessBuilder();
- pb.command(new String[] { JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF", System.getProperty("test.classes",".") + "/agent.jar", "Agent.class"});
- pb.start().waitFor();
+ pw.println("Agent-Class: " + Launcher.class.getPackage().getName() + ".Agent");
+ pw.println("Can-Retransform-Classes: true");
+ pw.close();
+
+ ProcessBuilder pb = new ProcessBuilder();
+ pb.command(new String[]{JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF",
+ System.getProperty("test.classes", ".") + "/agent.jar",
+ "compiler/profiling/spectrapredefineclass/Agent.class".replace('/', File.separatorChar)});
+ pb.start().waitFor();
}
}