Author: bodewig
Date: Wed Jul 16 08:30:27 2008
New Revision: 677307
URL: http://svn.apache.org/viewvc?rev=677307&view=rev
Log:
(failing) AntUnit test for bug 30542
Added:
ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/
ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/echo.xml (with
props)
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml
Added: ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/echo.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/echo.xml?rev=677307&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/echo.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/echo.xml Wed Jul 16
08:30:27 2008
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit">
+ <au:assertMatches string="${basedir}" pattern=".*subant-helper$"/>
+</project>
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/subant-helper/echo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml?rev=677307&r1=677306&r2=677307&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml Wed Jul 16
08:30:27 2008
@@ -39,4 +39,24 @@
</subant>
</target>
-</project>
\ No newline at end of file
+ <!-- four testcases for bug 30542, the last one failed -->
+ <target name="testSubAntDoesntSetBasedir">
+ <subant antfile="echo.xml">
+ <dirset dir="." includes="subant-helper"/>
+ </subant>
+ </target>
+
+ <target name="testSubAntDoesntSetBasedirAfterAntCall">
+ <antcall target="testSubAntDoesntSetBasedir"/>
+ </target>
+
+ <target name="testSubAntDoesntSetBasedirAfterAnt">
+ <ant antfile="${ant.file}" target="testSubAntDoesntSetBasedir"/>
+ </target>
+
+ <target name="XtestSubAntDoesntSetBasedirAfterAntWithDir">
+ <ant antfile="${ant.file}" dir="${basedir}"
+ target="testSubAntDoesntSetBasedir"/>
+ </target>
+
+</project>
