From d9a2dbc73bd574fb1d14b3d7aecbea85adbce339 Mon Sep 17 00:00:00 2001
From: Pavel Chistyakov <pavel.chistyakov@oracle.com>
Date: Sun, 22 Jun 2014 21:23:32 -0400
Subject: [PATCH] 8044818: [TESTBUG] runtime/CDSCompressedKPtrs/XShareAuto.java
 fails with RuntimeException 'sharing' found in stderr

Reviewed-by: hseigel, lfoltan, coleenp, dholmes
---
 .../test/runtime/CDSCompressedKPtrs/XShareAuto.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java
index 73f0c804312..458a781de80 100644
--- a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java
@@ -44,8 +44,16 @@ public class XShareAuto {
             "-server", "-XX:+UnlockDiagnosticVMOptions",
             "-XX:SharedArchiveFile=./sample.jsa", "-version");
         output = new OutputAnalyzer(pb.start());
-        output.shouldNotContain("sharing");
-        output.shouldHaveExitValue(0);
+        // We asked for server but it could be aliased to something else
+        if (output.getOutput().contains("Server VM")) {
+            // In server case we don't expect to see sharing flag
+            output.shouldNotContain("sharing");
+            output.shouldHaveExitValue(0);
+        }
+        else {
+            System.out.println("Skipping test - no Server VM available");
+            return;
+        }
 
         pb = ProcessTools.createJavaProcessBuilder(
             "-server", "-Xshare:auto", "-XX:+UnlockDiagnosticVMOptions",