Merge

2018-06-20 17:48:39 +01:00 · 2018-06-20 17:48:39 +01:00 · 8d102fbc49
commit 8d102fbc49
parent 659fdd8dc4 a22821323a
1 changed files with 4 additions and 3 deletions
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java
@ -166,9 +166,10 @@ public class BootAppendTests {
                           APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME);

            String MATCH_PATTERN = ".class.load. javax.annotation.processing.FilerException source:.*bootAppend.jar*";
-            OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
-            out.shouldHaveExitValue(0)
-                       .shouldNotMatch(MATCH_PATTERN);
+            CDSTestUtils.run(opts)
+                .assertNormalExit(out -> {
+                    out.shouldNotMatch(MATCH_PATTERN);
+                });
        }
    }