[hornetq-commits] JBoss hornetq SVN: r10014 - in trunk: tests/src/org/hornetq/tests/util and 1 other directory.
Author: pslavice(a)redhat.com
Date: 2010-12-08 05:44:57 -0500 (Wed, 08 Dec 2010)
New Revision: 10014
Modified:
trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java
trunk/tests/src/org/hornetq/tests/util/SpawnedVMSupport.java
Log:
Fixed test suite for Solaris platform HORNETQ-518
Modified: trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java
===================================================================
--- trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java 2010-12-08
09:53:15 UTC (rev 10013)
+++ trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java 2010-12-08
10:44:57 UTC (rev 10014)
@@ -74,7 +74,11 @@
sb.append("java").append(' ');
String vmarg = vmargs;
- if (System.getProperty("os.name").contains("Windows"))
+
+ String osName = System.getProperty("os.name");
+ osName = (osName != null) ? osName.toLowerCase() : "";
+ boolean isWindows = osName.contains("win");
+ if (isWindows)
{
vmarg = vmarg.replaceAll("/", "\\\\");
}
@@ -82,7 +86,6 @@
String pathSeparater = System.getProperty("path.separator");
classPath = classPath + pathSeparater + ".";
- boolean isWindows =
System.getProperty("os.name").contains("Windows");
if (isWindows)
{
sb.append("-cp").append("
\"").append(classPath).append("\" ");
Modified: trunk/tests/src/org/hornetq/tests/util/SpawnedVMSupport.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/SpawnedVMSupport.java 2010-12-08 09:53:15 UTC
(rev 10013)
+++ trunk/tests/src/org/hornetq/tests/util/SpawnedVMSupport.java 2010-12-08 10:44:57 UTC
(rev 10014)
@@ -91,14 +91,16 @@
String classPath = System.getProperty("java.class.path");
- // I guess it'd be simpler to check if the OS is Windows...
- if (System.getProperty("os.name").equals("Linux") ||
System.getProperty("os.name").equals("Mac OS X"))
+ String osName = System.getProperty("os.name");
+ osName = (osName != null) ? osName.toLowerCase() : "";
+ boolean isWindows = osName.contains("win");
+ if (isWindows)
{
- sb.append("-cp").append(" ").append(classPath).append("
");
+ sb.append("-cp").append("
\"").append(classPath).append("\" ");
}
else
{
- sb.append("-cp").append("
\"").append(classPath).append("\" ");
+ sb.append("-cp").append(" ").append(classPath).append("
");
}
sb.append("-Djava.io.tmpdir=" +
System.getProperty("java.io.tmpdir", "./tmp")).append(" ");