8235179: [TESTBUG] DynamicArchiveRelocationTest.java fails with 'runtime archive relocation start' missing

Reviewed-by: mseledtsov, ccheung
This commit is contained in:
Ioi Lam 2019-12-04 11:19:25 -08:00
parent 61cdeba65e
commit ce9ff0924f
2 changed files with 4 additions and 8 deletions
test/hotspot/jtreg/runtime/cds/appcds

@ -80,8 +80,7 @@ public class ArchiveRelocationTest {
TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg, mainClass)
.assertNormalExit(output -> {
if (run_reloc) {
output.shouldContain("runtime archive relocation start");
output.shouldContain("runtime archive relocation done");
output.shouldContain("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
}
});
}

@ -88,8 +88,7 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
String baseArchiveName = getNewArchiveName("base");
String topArchiveName = getNewArchiveName("top");
String runtimeMsg1 = "runtime archive relocation start";
String runtimeMsg2 = "runtime archive relocation done";
String runtimeMsg = "ArchiveRelocationMode == 1: always map archive(s) at an alternative address";
String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
// (1) Dump base archive (static)
@ -109,8 +108,7 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
"-cp", appJar, mainClass)
.assertNormalExit(output -> {
if (dump_top_reloc) {
output.shouldContain(runtimeMsg1);
output.shouldContain(runtimeMsg2);
output.shouldContain(runtimeMsg);
}
});
@ -121,8 +119,7 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
"-cp", appJar, mainClass)
.assertNormalExit(output -> {
if (run_reloc) {
output.shouldContain(runtimeMsg1);
output.shouldContain(runtimeMsg2);
output.shouldContain(runtimeMsg);
}
});
}