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

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

View file

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