Repository: ant Updated Branches: refs/heads/master c7d9b17b0 -> d96c85ba4
mklink doesn't work on our Jenkins nodes This reverts commit abdaa584530f4020f45162dce5d9b5d01b6751c0. Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d96c85ba Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d96c85ba Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d96c85ba Branch: refs/heads/master Commit: d96c85ba4c7a5c78a16f5c8790bfded24700302c Parents: c7d9b17 Author: Stefan Bodewig <[email protected]> Authored: Sun Apr 17 18:22:00 2016 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sun Apr 17 18:22:00 2016 +0200 ---------------------------------------------------------------------- src/tests/antunit/types/selectors/symlink-test.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/d96c85ba/src/tests/antunit/types/selectors/symlink-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/symlink-test.xml b/src/tests/antunit/types/selectors/symlink-test.xml index cb257ac..0c47326 100644 --- a/src/tests/antunit/types/selectors/symlink-test.xml +++ b/src/tests/antunit/types/selectors/symlink-test.xml @@ -25,16 +25,13 @@ <condition property="unix"> <os family="unix"/> </condition> - <condition property="windows"> - <os family="windows"/> - </condition> <target name="createTestdir"> <mkdir dir="${output}"/> <touch file="${output}/${file}"/> </target> - <target name="testSymlink" depends="makeSymlink"> + <target name="testSymlink" depends="makeSymlink" if="unix"> <au:assertTrue> <resourcecount when="equal" count="1"> <fileset dir="${output}"> @@ -56,11 +53,8 @@ <target name="makeSymlink-Unix" if="unix"> <symlink link="${output}/${link}" resource="${output}/${file}"/> </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 name="testNoSymlink" depends="createTestdir"> @@ -81,7 +75,7 @@ </au:assertFalse> </target> - <target name="testAsTrueConditions" depends="makeSymlink"> + <target name="testAsTrueConditions" depends="makeSymlink" if="unix"> <au:assertTrue> <isfileselected file="${output}/${link}"> <symlink/>
