Merge
authorchegar
Wed, 20 Jun 2018 17:48:39 +0100
changeset 50682 9663777e8d41
parent 50681 4254bed3c09d (current diff)
parent 50679 58dac477766c (diff)
child 50683 fba6889d5635
Merge
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java	Wed Jun 20 09:05:57 2018 -0700
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java	Wed Jun 20 17:48:39 2018 +0100
@@ -166,9 +166,10 @@
                            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);
+                });
         }
     }