archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8234622: [TESTBUG] ArchivedModuleCompareTest.java fails with -vmoptions:-Xlog:cds

Browse source 
Reviewed-by: mseledtsov
This commit is contained in:
Ioi Lam 2019-11-22 15:32:00 -08:00
parent 2429c8a484
commit 4edbdd1cb3
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java
View file

@ -662,4 +662,24 @@ public class TestCommon extends CDSTestUtils {
} }
return linkedJar; return linkedJar;
} }
// Remove all UL log messages from a JVM's STDOUT (such as those printed by -Xlog:cds)
static Pattern logPattern = Pattern.compile("^\\[[0-9. ]*s\\].*");
public static String filterOutLogs(String stdout) {
StringBuilder sb = new StringBuilder();
String prefix = "";
for (String line : stdout.split("\n")) {
if (logPattern.matcher(line).matches()) {
continue;
}
sb.append(prefix);
sb.append(line);
prefix = "\n";
}
if (stdout.endsWith("\n")) {
// String.split("A\n") returns {"A"}, not {"A", ""}.
sb.append("\n");
}
return sb.toString();
}
} }

8
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java
View file

@ -49,12 +49,12 @@ public class ArchivedModuleCompareTest {
output = TestCommon.execOff("-cp", appJar, "PrintSystemModulesApp"); output = TestCommon.execOff("-cp", appJar, "PrintSystemModulesApp");
output.shouldHaveExitValue(0); output.shouldHaveExitValue(0);
String bootModules1 = output.getStdout(); String bootModules1 = TestCommon.filterOutLogs(output.getStdout());
output = TestCommon.exec(appJar, "PrintSystemModulesApp"); output = TestCommon.exec(appJar, "PrintSystemModulesApp");
TestCommon.checkExec(output); TestCommon.checkExec(output);
if (output.getStderr().contains("sharing")) { if (output.getStderr().contains("sharing")) {
String bootModules2 = output.getStdout(); String bootModules2 = TestCommon.filterOutLogs(output.getStdout());
TestCommon.checkOutputStrings(bootModules1, bootModules2, ", "); TestCommon.checkOutputStrings(bootModules1, bootModules2, ", ");
} }
@ -66,14 +66,14 @@ public class ArchivedModuleCompareTest {
"--show-module-resolution", "--show-module-resolution",
"-version"); "-version");
output.shouldHaveExitValue(0); output.shouldHaveExitValue(0);
String moduleResolutionOut1 = output.getStdout(); String moduleResolutionOut1 = TestCommon.filterOutLogs(output.getStdout());
output = TestCommon.exec(appJar, output = TestCommon.exec(appJar,
"--show-module-resolution", "--show-module-resolution",
"-version"); "-version");
TestCommon.checkExec(output); TestCommon.checkExec(output);
if (output.getStderr().contains("sharing")) { if (output.getStderr().contains("sharing")) {
String moduleResolutionOut2 = output.getStdout(); String moduleResolutionOut2 = TestCommon.filterOutLogs(output.getStdout());
TestCommon.checkOutputStrings( TestCommon.checkOutputStrings(
moduleResolutionOut1, moduleResolutionOut2, "\n"); moduleResolutionOut1, moduleResolutionOut2, "\n");
} }