From a923f5c5d3dcb831cb9aacf7a65bfd4c6b46e34f Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jbachorik@openjdk.org>
Date: Fri, 10 Jan 2014 08:22:00 +0100
Subject: [PATCH] 8031420:
 sun/management/jmxremote/bootstrap/CustomLauncherTest.java fails on some
 platforms: Unable to locate 'libjvm.so'

Reviewed-by: sla, chegar, sjiang
---
 .../jmxremote/bootstrap/CustomLauncherTest.java          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
index 3b98056a98f..ca448159cd1 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
@@ -91,6 +91,12 @@ public class CustomLauncherTest {
             return;
         }
 
+        if (getPlatform() == null) {
+            System.out.println("Test not designed to run on this operating " +
+                                "system (" + OSNAME + "), skipping...");
+            return;
+        }
+
         final FileSystem FS = FileSystems.getDefault();
 
         Path libjvmPath = findLibjvm(FS);
@@ -223,8 +229,7 @@ public class CustomLauncherTest {
                 break;
             }
             default: {
-                System.out.println("Test not designed to run on this operating " +
-                                   "system (" + OSNAME + "), skipping...");
+                platform = null;
             }
         }