From 7665bc264e9923f65eb5cd80188cfec9cf338a41 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Thu, 29 Apr 2004 21:25:40 +0000
Subject: Restore Task inheritance to Exit/<fail>.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276428 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/fail.xml | 51 ++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 9 deletions(-)

(limited to 'src/etc/testcases/taskdefs')

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>
-- 
cgit v1.2.1