[QuickStart] Fix QuickStart test failures

Summary: Fix test failures Test Plan: all quickstart tests Reviewers: lei.yul, sanhong.lsh
dragonwell-project · Jul 12, 2023 · e0d65a1 · e0d65a1
1 parent 721ab94
commit e0d65a1
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 12 deletions.
diff --git a/test/jdk/com/alibaba/quickstart/TestDeterminingTracerOrReplayer.java b/test/jdk/com/alibaba/quickstart/TestDeterminingTracerOrReplayer.java
@@ -3,7 +3,7 @@
  * @summary Test the flow to determine tracer or replayer
  * @library /test/lib
  * @requires os.arch=="amd64"
- * @run main/othervm TestDeterminingTracerOrReplayer
+ * @run main/othervm/timeout=600 TestDeterminingTracerOrReplayer
  */
 
 import jdk.test.lib.process.OutputAnalyzer;

diff --git a/test/jdk/com/alibaba/quickstart/TestIntegrityCheck.java b/test/jdk/com/alibaba/quickstart/TestIntegrityCheck.java
@@ -3,7 +3,7 @@
  * @summary Test Integrity Check
  * @library /test/lib
  * @requires os.arch=="amd64"
- * @run main/othervm TestIntegrityCheck
+ * @run main/othervm/timeout=600 TestIntegrityCheck
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
@@ -37,7 +37,7 @@ void verifyOptionChange() throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xquickstart:path=" + cachepath, "-Xquickstart:verbose,containerImageEnv=pouchid", "-esa", "-version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         System.out.println(output.getOutput());
-        output.shouldContain("JVM option isn't the same");
+        output.shouldContain("JVM option count isn't the same");
         output.shouldHaveExitValue(0);
     }
 

diff --git a/test/jdk/com/alibaba/quickstart/TestNotifyDump.java b/test/jdk/com/alibaba/quickstart/TestNotifyDump.java
@@ -6,7 +6,7 @@
  * @build TestDump
  * @requires os.arch=="amd64"
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar test.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread
- * @run main/othervm TestNotifyDump
+ * @run main/othervm/timeout=600 TestNotifyDump
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
@@ -18,7 +18,7 @@
 
 public class TestNotifyDump {
 
-    private static final String TESTJAR = "./test.jar";
+    private static final String TESTJAR = "./test-notifyDump.jar";
     private static final String TESTCLASS = "TestDump";
 
     public static void main(String[] args) throws Exception {

diff --git a/test/jdk/com/alibaba/quickstart/TestNotifyDumpByAPI.java b/test/jdk/com/alibaba/quickstart/TestNotifyDumpByAPI.java
@@ -6,7 +6,7 @@
  * @build TestDump
  * @requires os.arch=="amd64"
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar test.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread
- * @run main/othervm TestNotifyDumpByAPI
+ * @run main/othervm/timeout=600 TestNotifyDumpByAPI
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
@@ -18,7 +18,7 @@
 
 public class TestNotifyDumpByAPI {
 
-    private static final String TESTJAR = "./test.jar";
+    private static final String TESTJAR = "./test-notifyDumpByAPI.jar";
     private static final String TESTCLASS = "TestDump";
 
     public static void main(String[] args) throws Exception {

diff --git a/test/jdk/com/alibaba/quickstart/TestNotifyDumpByJcmd.java b/test/jdk/com/alibaba/quickstart/TestNotifyDumpByJcmd.java
@@ -6,7 +6,7 @@
  * @build TestDump
  * @requires os.arch=="amd64"
  * @run driver jdk.test.lib.helpers.ClassFileInstaller  -jar test.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread
- * @run main/othervm TestNotifyDumpByJcmd
+ * @run main/othervm/timeout=600 TestNotifyDumpByJcmd
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
@@ -18,11 +18,12 @@
 
 public class TestNotifyDumpByJcmd {
 
-    private static final String TESTJAR = "./test.jar";
+    private static final String TESTJAR = "./test-notifyDumpByJcmd.jar";
     private static final String TESTCLASS = "TestDump";
 
     public static void main(String[] args) throws Exception {
         String dir = AccessController.doPrivileged(new GetPropertyAction("test.classes"));
+        destroyCache(dir);
         TestNotifyDumpByJcmd.verifyPathSetting(dir);
         new File(dir).delete();
     }
@@ -45,4 +46,14 @@ static void verifyPathSetting(String parentDir) throws Exception {
         output.shouldHaveExitValue(0);
     }
 
+    static void destroyCache(String parentDir) throws Exception {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-Xquickstart:destroy",
+                "-Xquickstart:path=" + parentDir + "/quickstartcache",
+                "-Xquickstart:verbose", "-version");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldContain("destroy the cache folder");
+        output.shouldHaveExitValue(0);
+    }
+
 }
diff --git a/test/jdk/com/alibaba/quickstart/TestParallelProcessRun.java b/test/jdk/com/alibaba/quickstart/TestParallelProcessRun.java
@@ -4,7 +4,7 @@
  * @library /test/lib
  * @library /lib/testlibrary
  * @requires os.arch=="amd64"
- * @run main/othervm TestParallelProcessRun
+ * @run main/othervm/timeout=600 TestParallelProcessRun
  */
 
 import jdk.test.lib.process.OutputAnalyzer;

diff --git a/test/jdk/com/alibaba/quickstart/TestPrintStat.java b/test/jdk/com/alibaba/quickstart/TestPrintStat.java
@@ -3,7 +3,7 @@
  * @summary Test -Xquickstart:printStat option
  * @library /test/lib
  * @requires os.arch=="amd64"
- * @run main/othervm TestPrintStat
+ * @run main/othervm/timeout=600 TestPrintStat
  */
 
 import jdk.test.lib.process.OutputAnalyzer;

diff --git a/test/jdk/com/alibaba/quickstart/TestQuickStartOptions.java b/test/jdk/com/alibaba/quickstart/TestQuickStartOptions.java
@@ -3,7 +3,7 @@
  * @summary Test -Xquickstart options
  * @library /test/lib
  * @requires os.arch=="amd64"
- * @run main/othervm TestQuickStartOptions
+ * @run main/othervm/timeout=600 TestQuickStartOptions
  */
 
 import jdk.test.lib.process.OutputAnalyzer;