git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@420576 13f79535-47bb-0310-9956-ffa450edef68master
@@ -1,7 +1,7 @@ | |||||
<?xml version="1.0"?> | <?xml version="1.0"?> | ||||
<project name="subant-test" basedir="." default="testgenericantfile"> | <project name="subant-test" basedir="." default="testgenericantfile"> | ||||
<target name="testnodirs" depends="cleanup"> | |||||
<target name="testnodirs" depends="tearDown"> | |||||
<subant genericantfile="subant/genericsubant.xml"> | <subant genericantfile="subant/genericsubant.xml"> | ||||
<dirset dir="." includes="subant-test*"/> | <dirset dir="." includes="subant-test*"/> | ||||
</subant> | </subant> | ||||
@@ -43,7 +43,7 @@ | |||||
</subant> | </subant> | ||||
</target> | </target> | ||||
<target name="cleanup"> | |||||
<target name="tearDown"> | |||||
<!-- nothing to do --> | <!-- nothing to do --> | ||||
</target> | </target> | ||||
</project> | </project> |
@@ -36,10 +36,6 @@ public class SubAntTest extends BuildFileTest { | |||||
configureProject("src/etc/testcases/taskdefs/subant.xml"); | configureProject("src/etc/testcases/taskdefs/subant.xml"); | ||||
} | } | ||||
public void tearDown() { | |||||
executeTarget("cleanup"); | |||||
} | |||||
public void testnodirs() { | public void testnodirs() { | ||||
project.executeTarget("testnodirs"); | project.executeTarget("testnodirs"); | ||||
expectLog("testnodirs", "No sub-builds to iterate on"); | expectLog("testnodirs", "No sub-builds to iterate on"); | ||||