Skip to content

Commit

Permalink
Absolute paths for some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrook
mrook committed Jan 3, 2013
1 parent ee5b455 commit 20809f6
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions test/etc/tasks/system/ApplyTest.xml
View file
Expand Up @@ -85,15 +85,15 @@
</target> </target>


<target name="testFailOnNonExistingDir"> <target name="testFailOnNonExistingDir">
<apply executable="echo" dir="/tmp/non/existent/dir" > <apply executable="/bin/echo" dir="/tmp/non/existent/dir" >
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
</fileset> </fileset>
</apply> </apply>
</target> </target>


<target name="testChangeToDir"> <target name="testChangeToDir">
<apply executable="ls" dir="/tmp/" addsourcefile="false" > <apply executable="/bin/ls" dir="/tmp/" addsourcefile="false" >
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
</fileset> </fileset>
Expand All @@ -117,7 +117,7 @@
</target> </target>


<target name="testOutputProperty"> <target name="testOutputProperty">
<apply executable="echo" outputProperty="execOutputProp" addsourcefile="false" parallel="true" > <apply executable="/bin/echo" outputProperty="execOutputProp" addsourcefile="false" parallel="true" >
<arg value="foo" /> <arg value="foo" />
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
Expand All @@ -138,7 +138,7 @@
<target name="testEscape"> <target name="testEscape">
<!-- 'Echo' combines multiple spaces, but not on MS Windows --> <!-- 'Echo' combines multiple spaces, but not on MS Windows -->
<apply executable="echo" escape="true" addsourcefile="false" parallel="true"> <apply executable="echo" escape="true" addsourcefile="false" parallel="true">
<arg line="foo | cat" /> <arg line="foo | cat "/>
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
</fileset> </fileset>
Expand All @@ -154,7 +154,7 @@
</target> </target>


<target name="testOutput"> <target name="testOutput">
<apply executable="echo" output="${execTmpFile}" addsourcefile="false" parallel="true"> <apply executable="/bin/echo" output="${execTmpFile}" addsourcefile="false" parallel="true">
<arg value="outfoo" /> <arg value="outfoo" />
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
Expand All @@ -163,7 +163,7 @@
</target> </target>


<target name="testError"> <target name="testError">
<apply executable="php" error="${execTmpFile}" addsourcefile="false" parallel="true" > <apply executable="/usr/bin/php" error="${execTmpFile}" addsourcefile="false" parallel="true" >
<arg line=" -r &quot;error_log('errfoo');&quot; " /> <arg line=" -r &quot;error_log('errfoo');&quot; " />
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
Expand All @@ -172,7 +172,7 @@
</target> </target>


<target name="testSpawn"> <target name="testSpawn">
<apply executable="sleep" spawn="true" addsourcefile="false" parallel="true" > <apply executable="/bin/sleep" spawn="true" addsourcefile="false" parallel="true" >
<arg value="5" /> <arg value="5" />
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
Expand All @@ -181,7 +181,7 @@
</target> </target>


<target name="testNestedArgs"> <target name="testNestedArgs">
<apply executable="echo" addsourcefile="false" parallel="true" > <apply executable="/bin/echo" addsourcefile="false" parallel="true" >
<arg value="Hello" /> <arg value="Hello" />
<arg line="World" /> <arg line="World" />
<fileset dir="/etc" > <fileset dir="/etc" >
Expand All @@ -195,7 +195,7 @@
</target> </target>


<target name="testEscapedArg"> <target name="testEscapedArg">
<apply executable="echo" escape="true" outputProperty="outval" addsourcefile="false" parallel="true"> <apply executable="/bin/echo" escape="true" outputProperty="outval" addsourcefile="false" parallel="true">
<arg value="abc$b3!SB" /> <arg value="abc$b3!SB" />
<fileset dir="/etc" > <fileset dir="/etc" >
<include name="*.ini" /> <include name="*.ini" />
Expand All @@ -220,15 +220,15 @@
</target> </target>


<target name="testOutputAppend"> <target name="testOutputAppend">
<apply executable="echo" parallel="true" output="${execTmpFile}" append="true" addsourcefile="false" > <apply executable="/bin/echo" parallel="true" output="${execTmpFile}" append="true" addsourcefile="false" >
<arg value="Append OK" /> <arg value="Append OK" />
<fileset dir="/etc" ><include name="*.ini" /></fileset> <fileset dir="/etc" ><include name="*.ini" /></fileset>
<fileset dir="/etc" ><include name="*.conf" /></fileset> <fileset dir="/etc" ><include name="*.conf" /></fileset>
</apply> </apply>
</target> </target>


<target name="testParallel"> <target name="testParallel">
<apply executable="echo" parallel="true" addsourcefile="false" > <apply executable="/bin/echo" parallel="true" addsourcefile="false" >
<arg value="Hello" /> <arg value="Hello" />
<fileset dir="/etc" ><include name="*.conf" /></fileset> <fileset dir="/etc" ><include name="*.conf" /></fileset>
</apply> </apply>
Expand Down

0 comments on commit 20809f6

Please sign in to comment.