8299777: Test runtime/NMT/BaselineWithParameter.java timed out

Reviewed-by: gziemski, iklam, dholmes
openjdk · Feb 21, 2023 · fef1910 · fef1910 · openjdk-notifier · Feb 21, 2023
1 parent 622f560
commit fef1910
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java b/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java
@@ -46,7 +46,8 @@ public static void main(String args[]) throws Exception {
 
     // Run 'jcmd <pid> VM.native_memory baseline=false'
     pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=false"});
-    pb.start().waitFor();
+    output = new OutputAnalyzer(pb.start());
+    output.shouldContain("Total: reserved");
 
     // Run 'jcmd <pid> VM.native_memory summary=false'
     pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary=false"});

diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java b/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java
@@ -54,7 +54,6 @@ public static void main(String args[]) throws Exception {
 
         // Run 'jcmd <pid> VM.native_memory baseline=true'
         pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=true"});
-        pb.start().waitFor();
 
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("Baseline taken");

diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdSummaryClass.java b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryClass.java
@@ -48,11 +48,10 @@ public static void main(String args[]) throws Exception {
 
         // Run 'jcmd <pid> VM.native_memory baseline=true'
         pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory"});
-        pb.start().waitFor();
+        output = new OutputAnalyzer(pb.start());
 
         String classes_line = "classes #\\d+";
         String instance_array_classes_line = "instance classes #\\d+, array classes #\\d+";
-        output = new OutputAnalyzer(pb.start());
         output.shouldMatch(classes_line);
         output.shouldMatch(instance_array_classes_line);
     }

diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java
@@ -54,7 +54,6 @@ public static void main(String args[]) throws Exception {
 
         // Run 'jcmd <pid> VM.native_memory baseline=true'
         pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=true"});
-        pb.start().waitFor();
 
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("Baseline taken");