# HG changeset patch
# User goetz
# Date 1419251894 -3600
# Node ID efe4f7bfbf8e095e3116061b4ceaa7bcaff0d59d
# Parent  89977bee2ddd2a690821a2ada810da2481fb4e5b
8068026: [TESTBUG] Check for -client in gc/g1/TestHumongousCodeCacheRoots.java

diff --git a/test/gc/g1/TestHumongousCodeCacheRoots.java b/test/gc/g1/TestHumongousCodeCacheRoots.java
--- a/test/gc/g1/TestHumongousCodeCacheRoots.java
+++ b/test/gc/g1/TestHumongousCodeCacheRoots.java
@@ -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;
   }