Author: kevj
Date: Wed Nov 7 19:11:14 2007
New Revision: 593002
URL: http://svn.apache.org/viewvc?rev=593002&view=rev
Log:
-merge rmic fix from trunk
Modified:
ant/core/branches/ANT_17_BRANCH/src/etc/testcases/taskdefs/rmic/rmic.xml
Modified:
ant/core/branches/ANT_17_BRANCH/src/etc/testcases/taskdefs/rmic/rmic.xml
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/etc/testcases/taskdefs/rmic/rmic.xml?rev=593002&r1=593001&r2=593002&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/etc/testcases/taskdefs/rmic/rmic.xml
(original)
+++ ant/core/branches/ANT_17_BRANCH/src/etc/testcases/taskdefs/rmic/rmic.xml
Wed Nov 7 19:11:14 2007
@@ -278,12 +278,15 @@
<assertBaseCompiled/>
</target>
- <target name="testXnew" if="rmic5.present" depends="init">
- <base-rmic compiler="sun">
- <compilerarg value="-Xnew"/>
- </base-rmic>
- <assertBaseCompiled/>
- </target>
+ <!--
+ This test stamps on the XML parser settings on java6, so it is
disabled.
+ -->
+ <target name="testXnew" if="rmic5.present" unless="rmic6.present"
depends="init">
+ <base-rmic compiler="sun">
+ <compilerarg value="-Xnew"/>
+ </base-rmic>
+ <assertBaseCompiled/>
+ </target>
<target name="testXnewForked" if="rmic5.present" depends="init">
<base-rmic compiler="forking">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
