Browse Source

Cause AntLikeTasksAtTopLevelTest to pass on cygwin.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276131 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 21 years ago
parent
commit
e435980752
2 changed files with 5 additions and 3 deletions
  1. +2
    -0
      WHATSNEW
  2. +3
    -3
      src/main/org/apache/tools/ant/taskdefs/Ant.java

+ 2
- 0
WHATSNEW View File

@@ -23,6 +23,8 @@ Fixed bugs:


* replacestring tokenfilter only replaced the first occurrence. * replacestring tokenfilter only replaced the first occurrence.


* AntLikeTasksAtTopLevelTest failed on cygwin.

Other changes: Other changes:
-------------- --------------




+ 3
- 3
src/main/org/apache/tools/ant/taskdefs/Ant.java View File

@@ -325,9 +325,9 @@ public class Ant extends Task {


// Are we trying to call the target in which we are defined (or // Are we trying to call the target in which we are defined (or
// the build file if this is a top level task)? // 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 (getOwningTarget().getName().equals("")) {
if (getTaskName().equals("antcall")) { if (getTaskName().equals("antcall")) {


Loading…
Cancel
Save