Browse Source

mklink doesn't work on our Jenkins nodes

This reverts commit abdaa58453.
master
Stefan Bodewig 9 years ago
parent
commit
d96c85ba4c
1 changed files with 4 additions and 10 deletions
  1. +4
    -10
      src/tests/antunit/types/selectors/symlink-test.xml

+ 4
- 10
src/tests/antunit/types/selectors/symlink-test.xml View File

@@ -25,16 +25,13 @@
<condition property="unix"> <condition property="unix">
<os family="unix"/> <os family="unix"/>
</condition> </condition>
<condition property="windows">
<os family="windows"/>
</condition>


<target name="createTestdir"> <target name="createTestdir">
<mkdir dir="${output}"/> <mkdir dir="${output}"/>
<touch file="${output}/${file}"/> <touch file="${output}/${file}"/>
</target> </target>


<target name="testSymlink" depends="makeSymlink">
<target name="testSymlink" depends="makeSymlink" if="unix">
<au:assertTrue> <au:assertTrue>
<resourcecount when="equal" count="1"> <resourcecount when="equal" count="1">
<fileset dir="${output}"> <fileset dir="${output}">
@@ -56,11 +53,8 @@
<target name="makeSymlink-Unix" if="unix"> <target name="makeSymlink-Unix" if="unix">
<symlink link="${output}/${link}" resource="${output}/${file}"/> <symlink link="${output}/${link}" resource="${output}/${file}"/>
</target> </target>
<target name="makeSymlink-Windows" if="windows">
<exec executable="mklink">
<arg file="${output}/${link}"/>
<arg file="${output}/${file}"/>
</exec>
<target name="makeSymlink-Windows" unless="unix">
<!-- no idea how to do this -->
</target> </target>


<target name="testNoSymlink" depends="createTestdir"> <target name="testNoSymlink" depends="createTestdir">
@@ -81,7 +75,7 @@
</au:assertFalse> </au:assertFalse>
</target> </target>


<target name="testAsTrueConditions" depends="makeSymlink">
<target name="testAsTrueConditions" depends="makeSymlink" if="unix">
<au:assertTrue> <au:assertTrue>
<isfileselected file="${output}/${link}"> <isfileselected file="${output}/${link}">
<symlink/> <symlink/>


Loading…
Cancel
Save