changeset 7840:8dfd8b00c7f1

8068026: [TESTBUG] Check for -client in gc/g1/TestHumongousCodeCacheRoots.java Summary: Skip test if -client is not supported. Reviewed-by: jwilhelm, simonis Contributed-by: goetz.lindenmaier@sap.com
author jwilhelm
date Thu, 15 Jan 2015 16:05:20 +0100
parents 57fbee73a452
children ab2a5923b542 4321214d5dbc
files test/gc/g1/TestHumongousCodeCacheRoots.java
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/gc/g1/TestHumongousCodeCacheRoots.java	Thu Jan 15 11:10:03 2015 +0100
+++ b/test/gc/g1/TestHumongousCodeCacheRoots.java	Thu Jan 15 16:05:20 2015 +0100
@@ -116,7 +116,14 @@
 
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(finalargs.toArray(new String[0]));
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldHaveExitValue(0);
+    try {
+        output.shouldHaveExitValue(0);
+    } catch (RuntimeException e) {
+        // It's ok if there is no client vm in the jdk.
+        if (output.firstMatch("Unrecognized option: -client") == null) {
+            throw e;
+        }
+    }
 
     return output;
   }