From fef1910277842303b41854c207fc4caba393adc6 Mon Sep 17 00:00:00 2001 From: Stefan Karlsson Date: Tue, 21 Feb 2023 10:58:36 +0000 Subject: [PATCH] 8299777: Test runtime/NMT/BaselineWithParameter.java timed out Reviewed-by: gziemski, iklam, dholmes --- test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java | 3 ++- test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java | 1 - test/hotspot/jtreg/runtime/NMT/JcmdSummaryClass.java | 3 +-- test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java b/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java index 977a10dd3f8..3e3cb4e60ca 100644 --- a/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java +++ b/test/hotspot/jtreg/runtime/NMT/BaselineWithParameter.java @@ -46,7 +46,8 @@ public class BaselineWithParameter { // Run 'jcmd 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 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 index b5e0040c3b0..75ed55f3462 100644 --- a/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java +++ b/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java @@ -54,7 +54,6 @@ public class JcmdDetailDiff { // Run 'jcmd 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 index ad22a54cef4..76aa17fbaa2 100644 --- a/test/hotspot/jtreg/runtime/NMT/JcmdSummaryClass.java +++ b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryClass.java @@ -48,11 +48,10 @@ public class JcmdSummaryClass { // Run 'jcmd 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 index 4437f1ffdc2..6eadb76d671 100644 --- a/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java +++ b/test/hotspot/jtreg/runtime/NMT/JcmdSummaryDiff.java @@ -54,7 +54,6 @@ public class JcmdSummaryDiff { // Run 'jcmd 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");