Mercurial > hg > icedtea9-forest > langtools

changeset 1196:a7a2720c7897

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7122342: testPrintProcessorInfo/TestWithXstdout.java failed for JDK8 nightly build at 12/16/2011 Summary: Do not pass empty args to javac Reviewed-by: jjg
author jjh
date Fri, 16 Dec 2011 16:41:00 -0800
parents 6b773fdeb633
children 1ae5988e201b
files test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java	Fri Dec 16 13:49:44 2011 -0800
+++ b/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java	Fri Dec 16 16:41:00 2011 -0800
@@ -58,11 +58,14 @@
         if (javaHome.getName().equals("jre"))
             javaHome = javaHome.getParentFile();
         File javac = new File(new File(javaHome, "bin"), "javac");
-        String toolOpts = System.getProperty("test.tool.vm.opts");
 
         List<String> opts = new ArrayList<>();
         opts.add(javac.getPath());
-        opts.addAll(Arrays.asList(toolOpts.trim().split("[\\s]+")));
+
+        String toolOpts = System.getProperty("test.tool.vm.opts");
+        if (toolOpts != null && !"".equals(toolOpts.trim())) {
+            opts.addAll(Arrays.asList(toolOpts.trim().split("[\\s]+")));
+        }
         opts.addAll(Arrays.asList(args));
         System.out.println("exec: " + opts);
         ProcessBuilder pb = new ProcessBuilder(opts);