changeset 58864:124164752fe4

8234196: [TESTBUG] DynamicArchiveRelocationTest.java missing "ArchiveRelocationMode == 1 ...." Reviewed-by: dcubed
author iklam
date Thu, 14 Nov 2019 14:54:39 -0800
parents 148921c01038
children 9afab9bf3e6a
files test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java	Wed Nov 13 16:49:14 2019 -0800
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java	Thu Nov 14 14:54:39 2019 -0800
@@ -80,7 +80,6 @@
         TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg,  mainClass)
             .assertNormalExit(output -> {
                     if (run_reloc) {
-                        output.shouldContain("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
                         output.shouldContain("runtime archive relocation start");
                         output.shouldContain("runtime archive relocation done");
                     }
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java	Wed Nov 13 16:49:14 2019 -0800
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java	Thu Nov 14 14:54:39 2019 -0800
@@ -88,9 +88,8 @@
         String baseArchiveName = getNewArchiveName("base");
         String topArchiveName  = getNewArchiveName("top");
 
-        String runtimeMsg1 = "ArchiveRelocationMode == 1: always map archive(s) at an alternative address";
-        String runtimeMsg2 = "runtime archive relocation start";
-        String runtimeMsg3 = "runtime archive relocation done";
+        String runtimeMsg1 = "runtime archive relocation start";
+        String runtimeMsg2 = "runtime archive relocation done";
         String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
 
         // (1) Dump base archive (static)
@@ -112,7 +111,6 @@
                     if (dump_top_reloc) {
                         output.shouldContain(runtimeMsg1);
                         output.shouldContain(runtimeMsg2);
-                        output.shouldContain(runtimeMsg3);
                     }
                 });
 
@@ -125,7 +123,6 @@
                     if (run_reloc) {
                         output.shouldContain(runtimeMsg1);
                         output.shouldContain(runtimeMsg2);
-                        output.shouldContain(runtimeMsg3);
                     }
                 });
     }