Repository: ant Updated Branches: refs/heads/master 97ac9bc7c -> 46328b6bb
bring back root system property Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/46328b6b Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/46328b6b Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/46328b6b Branch: refs/heads/master Commit: 46328b6bbfa550a5eaa36d68c3d8d26c0960bcf6 Parents: 97ac9bc Author: Stefan Bodewig <[email protected]> Authored: Sat Apr 14 20:35:31 2018 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sat Apr 14 20:35:31 2018 +0200 ---------------------------------------------------------------------- src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/46328b6b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java index 29680f0..c6e2acc 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java @@ -125,15 +125,15 @@ public class ImportTest { } assumeTrue("Current system does not support Symlinks", new File(ln).exists()); String symlink = "src/etc/testcases/taskdefs/import/symlinks/d3b"; - File symlinkFile = new File(symlink); + File symlinkFile = new File(System.getProperty("root"), symlink); assertEquals("'" + ln + " -s d3a " + symlink + "' failed", Runtime.getRuntime().exec(new String[] {ln, "-s", "d3a", symlinkFile.getAbsolutePath()}).waitFor(), 0); try { buildRule.configureProject("src/etc/testcases/taskdefs/import/symlinks/d1/p1.xml"); assertEquals(buildRule.getProject().getProperty("ant.file.p2"), - new File("src/etc/testcases/taskdefs/import/symlinks/d2/p2.xml").getAbsolutePath()); + new File(System.getProperty("root"), "src/etc/testcases/taskdefs/import/symlinks/d2/p2.xml").getAbsolutePath()); assertEquals(buildRule.getProject().getProperty("ant.file.p3"), - new File("src/etc/testcases/taskdefs/import/symlinks/d3b/p3.xml").getAbsolutePath()); + new File(System.getProperty("root"), "src/etc/testcases/taskdefs/import/symlinks/d3b/p3.xml").getAbsolutePath()); } finally { symlinkFile.delete(); }
