# HG changeset patch
# User dsamersoff
# Date 1392243399 0
# Node ID 93206a165a907234c221b7a386da3389126f1287
# Parent  0d10bb7339a943c7e7598aba4f0f137c0c20e93b# Parent  a33338c961e2b772f9578d5d9d6ff65e089baa3b
Merge

diff -r a33338c961e2 -r 93206a165a90 test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
--- a/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java	Wed Feb 12 21:55:56 2014 +0000
+++ b/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java	Wed Feb 12 22:16:39 2014 +0000
@@ -154,7 +154,7 @@
 
     if (addTestVmOptions) {
       String vmopts = System.getProperty("test.vm.opts");
-      if (vmopts != null) {
+      if (vmopts != null && vmopts.length() > 0) {
         Collections.addAll(args, vmopts.split("\\s"));
       }
     }