summaryrefslogtreecommitdiff
path: root/src/etc/testcases
diff options
context:
space:
mode:
authorMatthew Jason Benson <mbenson@apache.org>2004-04-29 21:25:40 +0000
committerMatthew Jason Benson <mbenson@apache.org>2004-04-29 21:25:40 +0000
commit7665bc264e9923f65eb5cd80188cfec9cf338a41 (patch)
tree8fddf5f773c247657abfa86026383e4adfd2c9a5 /src/etc/testcases
parent1f6f45aebb95ddf56779db1609bf7bfcd4eddcb3 (diff)
downloadant-7665bc264e9923f65eb5cd80188cfec9cf338a41.tar.gz
Restore Task inheritance to Exit/<fail>.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276428 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/etc/testcases')
-rw-r--r--src/etc/testcases/taskdefs/fail.xml51
1 files changed, 42 insertions, 9 deletions
diff --git a/src/etc/testcases/taskdefs/fail.xml b/src/etc/testcases/taskdefs/fail.xml
index b7b7f3037..d32c2c6c9 100644
--- a/src/etc/testcases/taskdefs/fail.xml
+++ b/src/etc/testcases/taskdefs/fail.xml
@@ -28,54 +28,87 @@
<target name="testNested1" description="should fail with default message">
<fail>
- <and />
+ <condition>
+ <and />
+ </condition>
</fail>
</target>
<target name="testNested2" description="should pass">
<fail>
- <or />
+ <condition>
+ <or />
+ </condition>
</fail>
</target>
<target name="testNested3" description="should fail">
<fail message="testNested3">
- <and />
+ <condition>
+ <and />
+ </condition>
</fail>
</target>
<target name="testNested4a" description="should error">
<fail if="if">
- <and />
+ <condition>
+ <and />
+ </condition>
</fail>
</target>
<target name="testNested4b" description="should error">
<fail unless="unless">
- <and />
+ <condition>
+ <and />
+ </condition>
</fail>
</target>
<target name="testNested4c" description="should error">
<fail if="if" unless="unless">
- <and />
+ <condition>
+ <and />
+ </condition>
</fail>
</target>
<target name="testNested5" description="should error">
<fail>
- <and />
- <or />
+ <condition>
+ <or />
+ </condition>
+ <condition>
+ <and />
+ </condition>
</fail>
</target>
<target name="testNested6" description="should fail with message">
<fail>
- <and />
+ <condition>
+ <and />
+ </condition>
testNested6
testNested6
testNested6
</fail>
</target>
+ <target name="testNested7a" description="should error">
+ <fail>
+ <condition />
+ </fail>
+ </target>
+
+ <target name="testNested7b" description="should error">
+ <fail>
+ <condition>
+ <and />
+ <and />
+ </condition>
+ </fail>
+ </target>
+
</project>