8191504: [TESTBUG] CDSTestUtils.isUnableToMap() should check OptionalData region mapping failure
authorjiangli
Mon, 27 Nov 2017 20:35:56 -0500
changeset 48137 0afc5f9eafef
parent 48136 c035fbb1beb4
child 48138 78b2ecdd3c4b
8191504: [TESTBUG] CDSTestUtils.isUnableToMap() should check OptionalData region mapping failure Summary: Check all regions for mapping failure in CDSTestUtils.isUnableToMap(). Reviewed-by: iklam, ccheung, mseledtsov
test/lib/jdk/test/lib/cds/CDSTestUtils.java
--- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java	Tue Jun 20 16:25:53 2017 +0800
+++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java	Mon Nov 27 20:35:56 2017 -0500
@@ -166,9 +166,9 @@
             outStr.contains("Unable to map ReadWrite shared space at required address") ||
             outStr.contains("Unable to map MiscData shared space at required address") ||
             outStr.contains("Unable to map MiscCode shared space at required address") ||
-            outStr.contains("Unable to map shared string space at required address") ||
+            outStr.contains("Unable to map OptionalData shared space at required address") ||
             outStr.contains("Could not allocate metaspace at a compatible address") ||
-            outStr.contains("Unable to allocate shared string space: range is not within java heap") ))
+            outStr.contains("UseSharedSpaces: Unable to allocate region, range is not within java heap") ))
         {
             return true;
         }