Author: bodewig Date: Sun Oct 8 21:22:00 2006 New Revision: 454277 URL: http://svn.apache.org/viewvc?view=rev&rev=454277 Log: fix svn property
Modified: ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml (contents, props changed) ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml (contents, props changed) Modified: ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml?view=diff&rev=454277&r1=454276&r2=454277 ============================================================================== --- ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml (original) +++ ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml Sun Oct 8 21:22:00 2006 @@ -1,3 +1,3 @@ -<project default="all"> - <target name="all"/> -</project> +<project default="all"> + <target name="all"/> +</project> Propchange: ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/core/trunk/src/tests/antunit/types/build-embedded-ref.xml ('svn:eol-type' removed) Modified: ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml?view=diff&rev=454277&r1=454276&r2=454277 ============================================================================== --- ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml (original) +++ ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml Sun Oct 8 21:22:00 2006 @@ -1,61 +1,61 @@ -<project default="all" xmlns:au="antlib:org.apache.ant.antunit"> - <target name="notcalled"> - <filelist id="ref1" dir="${basedir}" files="xxx" /> - </target> - - <target name="test-notcalled"> - <!-- bug 36955 --> - <au:expectfailure> - <pathconvert property="_output2" refid="ref1" - pathsep="${line.separator}" /> - </au:expectfailure> - </target> - - <target name="test-macrodef-embedded-ref"> - <!-- bug 34458 --> - <macrodef name="foo"> - <element name="nested" implicit="yes" optional="yes"/> - <sequential> - <fileset id="abc" dir="."> - <nested/> - </fileset> - </sequential> - </macrodef> - - <ant antfile="build-embedded-ref.xml" inheritRefs="true"/> - </target> - - <condition property="allow.script"> - <and> - <available classname="org.apache.bsf.BSFManager" /> - <available classname="bsh.StringUtil" /> - </and> - </condition> - - <target name="test-script" if="allow.script"> - <!-- bugzilla: 37688 --> - <macrodef name="compileMapper" > - <attribute name="objDir" /> - <attribute name="id" default="compileMapperID" /> - <sequential> - <mkdir dir="@{objDir}"/> - <mapper id="@{id}"> - <chainedmapper > - <flattenmapper/> - <globmapper from="*" to="@{objDir}/*.o"/> - </chainedmapper> - </mapper> - </sequential> - </macrodef> - <script language="beanshell"/> - </target> - - <target name="all"> - <au:antunit> - <fileset file="${ant.file}"/> - <au:plainlistener/> - </au:antunit> - </target> - - -</project> +<project default="all" xmlns:au="antlib:org.apache.ant.antunit"> + <target name="notcalled"> + <filelist id="ref1" dir="${basedir}" files="xxx" /> + </target> + + <target name="test-notcalled"> + <!-- bug 36955 --> + <au:expectfailure> + <pathconvert property="_output2" refid="ref1" + pathsep="${line.separator}" /> + </au:expectfailure> + </target> + + <target name="test-macrodef-embedded-ref"> + <!-- bug 34458 --> + <macrodef name="foo"> + <element name="nested" implicit="yes" optional="yes"/> + <sequential> + <fileset id="abc" dir="."> + <nested/> + </fileset> + </sequential> + </macrodef> + + <ant antfile="build-embedded-ref.xml" inheritRefs="true"/> + </target> + + <condition property="allow.script"> + <and> + <available classname="org.apache.bsf.BSFManager" /> + <available classname="bsh.StringUtil" /> + </and> + </condition> + + <target name="test-script" if="allow.script"> + <!-- bugzilla: 37688 --> + <macrodef name="compileMapper" > + <attribute name="objDir" /> + <attribute name="id" default="compileMapperID" /> + <sequential> + <mkdir dir="@{objDir}"/> + <mapper id="@{id}"> + <chainedmapper > + <flattenmapper/> + <globmapper from="*" to="@{objDir}/*.o"/> + </chainedmapper> + </mapper> + </sequential> + </macrodef> + <script language="beanshell"/> + </target> + + <target name="all"> + <au:antunit> + <fileset file="${ant.file}"/> + <au:plainlistener/> + </au:antunit> + </target> + + +</project> Propchange: ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/core/trunk/src/tests/antunit/types/defer-reference-test.xml ('svn:eol-type' removed) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]