stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8258057: serviceability/attach/RemovingUnixDomainSocketTest.java doesn't ignore VM warnings

Browse Source 
Reviewed-by: cjplummer, amenkov, dholmes
This commit is contained in:
Patricio Chilano Mateo 2020-12-17 16:41:50 +00:00
parent 143998e46c
commit 7b05439dcc
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/hotspot/jtreg/serviceability/attach/RemovingUnixDomainSocketTest.java
View File

@ -51,7 +51,8 @@ public class RemovingUnixDomainSocketTest {
jcmd.addToolArg(Long.toString(pid)); jcmd.addToolArg(Long.toString(pid));
jcmd.addToolArg("VM.version"); jcmd.addToolArg("VM.version");
Process jcmdProc = ProcessTools.startProcess("jcmd", new ProcessBuilder(jcmd.getCommand())); ProcessBuilder pb = new ProcessBuilder(jcmd.getCommand());
Process jcmdProc = pb.start();
OutputAnalyzer out = new OutputAnalyzer(jcmdProc); OutputAnalyzer out = new OutputAnalyzer(jcmdProc);
@ -66,7 +67,7 @@ public class RemovingUnixDomainSocketTest {
"jcmd exitValue = " + out.getExitValue()); "jcmd exitValue = " + out.getExitValue());
out.shouldHaveExitValue(0); out.shouldHaveExitValue(0);
out.stderrShouldBeEmptyIgnoreVMWarnings(); out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
} }
public static void main(String... args) throws Exception { public static void main(String... args) throws Exception {

17
test/lib/jdk/test/lib/process/OutputAnalyzer.java
View File

@ -40,6 +40,8 @@ public final class OutputAnalyzer {
private static final String jvmwarningmsg = ".* VM warning:.*"; private static final String jvmwarningmsg = ".* VM warning:.*";
private static final String deprecatedmsg = ".* VM warning:.* deprecated.*";
private final OutputBuffer buffer; private final OutputBuffer buffer;
/** /**
* Create an OutputAnalyzer, a utility class for verifying output and exit * Create an OutputAnalyzer, a utility class for verifying output and exit
@ -147,6 +149,21 @@ public final class OutputAnalyzer {
return this; return this;
} }
/**
* Verify that the stderr contents of output buffer is empty,
* after filtering out the Hotspot deprecation warning messages
*
* @throws RuntimeException
* If stderr was not empty
*/
public OutputAnalyzer stderrShouldBeEmptyIgnoreDeprecatedWarnings() {
if (!getStderr().replaceAll(deprecatedmsg + "\\R", "").isEmpty()) {
reportDiagnosticSummary();
throw new RuntimeException("stderr was not empty");
}
return this;
}
/** /**
* Verify that the stdout contents of output buffer is not empty * Verify that the stdout contents of output buffer is not empty
* *