8357064: cds/appcds/ArchiveRelocationTest.java failed with missing expected output

Backport-of: 534d2b33dc23d0171fdce3cb89d679d5088b4667

Author: calvinccheung

test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java

@@ -67,6 +67,8 @@ static void test(boolean run_reloc) throws Exception {
         String logArg = "-Xlog:cds=debug,cds+reloc=debug,aot+heap";
         String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
         String nmtArg = "-XX:NativeMemoryTracking=detail";
+        String relocMsg1 = "ArchiveRelocationMode == 1: always map archive(s) at an alternative address";
+        String relocMsg2 = "Try to map archive(s) at an alternative address";
 
         OutputAnalyzer out = TestCommon.dump(appJar,
                                              TestCommon.list(mainClass),
@@ -76,8 +78,10 @@ static void test(boolean run_reloc) throws Exception {
         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")
-                              .shouldContain("Try to map archive(s) at an alternative address");
+                        if (!output.contains(relocMsg1) && !output.contains(relocMsg2)) {
+                            throw new RuntimeException("Relocation messages \"" + relocMsg1 +
+                                "\" and \"" + relocMsg2 + "\" are missing from the output");
+                        }
                     } else {
                         output.shouldContain("ArchiveRelocationMode: 0");
                     }