changeset 9082:4fe97a79c2f1

8031420: sun/management/jmxremote/bootstrap/CustomLauncherTest.java fails on some platforms: Unable to locate 'libjvm.so' Reviewed-by: sla, chegar, sjiang
author jbachorik
date Fri, 10 Jan 2014 08:22:00 +0100
parents 041ddbd7ef00
children 6f0c0ddd2853
files test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Wed Dec 18 11:00:48 2013 +0100
+++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Fri Jan 10 08:22:00 2014 +0100
@@ -91,6 +91,12 @@
             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 @@
                 break;
             }
             default: {
-                System.out.println("Test not designed to run on this operating " +
-                                   "system (" + OSNAME + "), skipping...");
+                platform = null;
             }
         }