Browse Source

I had hardcoded the test.can.run property, also I had emptied the cleanup

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1095224 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 14 years ago
parent
commit
f1091d6ac4
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      src/etc/testcases/taskdefs/exec/exec.xml

+ 3
- 2
src/etc/testcases/taskdefs/exec/exec.xml View File

@@ -16,11 +16,11 @@
limitations under the License. limitations under the License.
--> -->
<project name="exec-test" default="spawn" basedir="."> <project name="exec-test" default="spawn" basedir=".">
<property name="output" location="${java.io.tmpdir}/testoutput"/>
<target name="init"> <target name="init">
<!-- this property can be overriden programatically in the Java test case --> <!-- this property can be overriden programatically in the Java test case -->
<property name="timeToWait" value="10"/> <property name="timeToWait" value="10"/>
<!-- this property can be overriden programatically in the Java test case --> <!-- this property can be overriden programatically in the Java test case -->
<property name="output" location="${java.io.tmpdir}/testoutput"/>
<mkdir dir="${output}"/> <mkdir dir="${output}"/>
<property name="logFile" value="${output}/spawn.log"/> <property name="logFile" value="${output}/spawn.log"/>
<property environment="env"/> <property environment="env"/>
@@ -28,7 +28,6 @@
<available file="sh" filepath="${env.PATH}" property="sh.executable"/> <available file="sh" filepath="${env.PATH}" property="sh.executable"/>
<!-- CYGWIN --> <!-- CYGWIN -->
<available file="sh.exe" filepath="${env.PATH}" property="sh.exe.executable"/> <available file="sh.exe" filepath="${env.PATH}" property="sh.exe.executable"/>
<property name="test.can.run" value="1"/>
<condition property="test.can.run"> <condition property="test.can.run">
<or> <or>
<isset property="sh.executable"/> <isset property="sh.executable"/>
@@ -65,5 +64,7 @@
</target> </target>


<target name="cleanup"> <target name="cleanup">
<delete file="${logFile}"/>
<delete dir="${output}"/>
</target> </target>
</project> </project>

Loading…
Cancel
Save