From a4a5fb9b14851096420d639ec5dee731b59b738b Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 9 Apr 2012 05:00:47 +0000
Subject: [PATCH] ensure forward-slashes on Windows; deal with directories
 containing spaces in exec task's arguments

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1311130 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/exec/exec-test.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tests/antunit/taskdefs/exec/exec-test.xml b/src/tests/antunit/taskdefs/exec/exec-test.xml
index 777b5a852..f0ee949f5 100644
--- a/src/tests/antunit/taskdefs/exec/exec-test.xml
+++ b/src/tests/antunit/taskdefs/exec/exec-test.xml
@@ -639,13 +639,16 @@
       <pathconvert dirsep="/" property="out">
         <path location="${output}"/>
       </pathconvert>
+      <pathconvert dirsep="/" property="javaP">
+        <path location="${java}"/>
+      </pathconvert>
       <echo file="${input}/org/example/CallHello.java"><![CDATA[
 package org.example;
 public class CallHello {
     public static void main(String[] args)
         throws Exception {
         String[] cmd = new String[] {
-            "${java}", "-cp", "${out}", "org.example.Hello"
+            "${javaP}", "-cp", "${out}", "org.example.Hello"
         };
         Runtime.getRuntime().exec(cmd);
         Thread.sleep(1 * 1000);
@@ -667,7 +670,9 @@ public class Hello {
       <mkdir dir="${output}"/>
       <javac srcdir="${input}" destdir="${output}"/>
       <exec executable="${java}" failonerror="true">
-        <arg line="-cp ${output} org.example.CallHello"/>
+        <arg value="-cp"/>
+        <arg value="${output}"/>
+        <arg value="org.example.CallHello"/>
       </exec>
       <au:assertLogContains text="finished"/>
       <au:assertLogDoesntContain text="Hello 20"/>