OpenJDK / amber / amber
changeset 59167:f97907a7bba9
8235179: [TESTBUG] DynamicArchiveRelocationTest.java fails with 'runtime archive relocation start' missing
Reviewed-by: mseledtsov, ccheung
| author | iklam |
|---|---|
| date | Wed, 04 Dec 2019 11:19:25 -0800 |
| parents | db5097a1ec61 |
| children | 288777cf0702 |
| files | test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java |
| diffstat | 2 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java Wed Dec 04 20:03:50 2019 +0100 +++ b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java Wed Dec 04 11:19:25 2019 -0800 @@ -80,8 +80,7 @@ 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"); } }); }
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java Wed Dec 04 20:03:50 2019 +0100 +++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java Wed Dec 04 11:19:25 2019 -0800 @@ -88,8 +88,7 @@ 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 @@ "-cp", appJar, mainClass) .assertNormalExit(output -> { if (dump_top_reloc) { - output.shouldContain(runtimeMsg1); - output.shouldContain(runtimeMsg2); + output.shouldContain(runtimeMsg); } }); @@ -121,8 +119,7 @@ "-cp", appJar, mainClass) .assertNormalExit(output -> { if (run_reloc) { - output.shouldContain(runtimeMsg1); - output.shouldContain(runtimeMsg2); + output.shouldContain(runtimeMsg); } }); }