From e435980752ae996460ce72ddec5a6fb84829fb5b Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Fri, 20 Feb 2004 22:15:52 +0000 Subject: [PATCH] Cause AntLikeTasksAtTopLevelTest to pass on cygwin. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276131 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ src/main/org/apache/tools/ant/taskdefs/Ant.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 63d9dc505..70aa23b8a 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -23,6 +23,8 @@ Fixed bugs: * replacestring tokenfilter only replaced the first occurrence. +* AntLikeTasksAtTopLevelTest failed on cygwin. + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index 7f79b30c3..a81c651f4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -325,9 +325,9 @@ public class Ant extends Task { // Are we trying to call the target in which we are defined (or // the build file if this is a top level task)? - if (newProject.getProperty("ant.file") - .equals(getProject().getProperty("ant.file")) - && getOwningTarget() != null) { + if (newProject.resolveFile(newProject.getProperty("ant.file")) + .equals(getProject().resolveFile(getProject() + .getProperty("ant.file"))) && getOwningTarget() != null) { if (getOwningTarget().getName().equals("")) { if (getTaskName().equals("antcall")) {