incubator-rat-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r736492 - in /incubator/rat/main/trunk/rat/rat-anttasks: pom.xml src/test/resources/antunit/report-bad-configurations.xml src/test/resources/antunit/report-normal-operation.xml
Date Wed, 21 Jan 2009 23:48:18 GMT
Author: rdonkin
Date: Wed Jan 21 15:48:18 2009
New Revision: 736492

URL: http://svn.apache.org/viewvc?rev=736492&view=rev
Log:
Ensure build fails when antutil tasks fail. Run ant tasks from maven classpaths. Note that
report-normal-operations fails for me (with javac issues). Think this may be a gentoo specific
issue (gentoo does funny things to JAVA_HOME) so I'm commiting this now.

Modified:
    incubator/rat/main/trunk/rat/rat-anttasks/pom.xml
    incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-bad-configurations.xml
    incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-normal-operation.xml

Modified: incubator/rat/main/trunk/rat/rat-anttasks/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/rat/rat-anttasks/pom.xml?rev=736492&r1=736491&r2=736492&view=diff
==============================================================================
--- incubator/rat/main/trunk/rat/rat-anttasks/pom.xml (original)
+++ incubator/rat/main/trunk/rat/rat-anttasks/pom.xml Wed Jan 21 15:48:18 2009
@@ -77,11 +77,19 @@
             </goals>
             <configuration>
               <tasks>
-                <ant antfile="src/test/resources/antunit/build.xml" inheritAll="false"
inheritRefs="false">
+                <ant antfile="src/test/resources/antunit/report-bad-configurations.xml"
inheritAll="false" inheritRefs="false">
                   <property name="jar.name" location="${project.build.outputDirectory}"/>
                   <property name="base.dir" location="${basedir}"/>
                   <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
                   <property name="test.skipped" value="${maven.test.skip}"/>
+				  <property name="test.classpath" refid="maven.test.classpath" />
+                </ant>
+				<ant antfile="src/test/resources/antunit/report-normal-operation.xml" inheritAll="false"
inheritRefs="false">
+                  <property name="jar.name" location="${project.build.outputDirectory}"/>
+                  <property name="base.dir" location="${basedir}"/>
+                  <property name="antunit.jar.name" location="${project.build.directory}/dependencies/ant-antunit.jar"/>
+                  <property name="test.skipped" value="${maven.test.skip}"/>
+				  <property name="test.classpath" refid="maven.test.classpath" />
                 </ant>
               </tasks>
             </configuration>

Modified: incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-bad-configurations.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-bad-configurations.xml?rev=736492&r1=736491&r2=736492&view=diff
==============================================================================
--- incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-bad-configurations.xml
(original)
+++ incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-bad-configurations.xml
Wed Jan 21 15:48:18 2009
@@ -21,8 +21,20 @@
 -->
 
 <project default="allTests"
+	name='report-bad-configurations'
   xmlns:au="antlib:org.apache.ant.antunit"
   xmlns:rat="antlib:org.apache.rat.anttasks">
+    
+    <taskdef uri="antlib:org.apache.ant.antunit" 
+        resource="org/apache/ant/antunit/antlib.xml" 
+        classpath="${test.classpath}" />
+
+    <taskdef uri="antlib:org.apache.rat.anttasks" resource="org/apache/rat/anttasks/antlib.xml">
+        <classpath>
+            <pathelement location="${jar.name}" />
+            <pathelement path='${test.classpath}' />
+        </classpath>
+    </taskdef>
 
   <target name="allTests">
     <au:antunit xmlns:au="antlib:org.apache.ant.antunit"

Modified: incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-normal-operation.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-normal-operation.xml?rev=736492&r1=736491&r2=736492&view=diff
==============================================================================
--- incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-normal-operation.xml
(original)
+++ incubator/rat/main/trunk/rat/rat-anttasks/src/test/resources/antunit/report-normal-operation.xml
Wed Jan 21 15:48:18 2009
@@ -20,10 +20,22 @@
 
 -->
 
-<project default="allTests"
-  xmlns:au="antlib:org.apache.ant.antunit"
-  xmlns:rat="antlib:org.apache.rat.anttasks">
-
+<project name='report-normal-operation'
+	default="allTests"
+  	xmlns:au="antlib:org.apache.ant.antunit"
+  	xmlns:rat="antlib:org.apache.rat.anttasks">
+
+    <taskdef uri="antlib:org.apache.ant.antunit" 
+        resource="org/apache/ant/antunit/antlib.xml" 
+        classpath="${test.classpath}" />
+
+    <taskdef uri="antlib:org.apache.rat.anttasks" resource="org/apache/rat/anttasks/antlib.xml">
+        <classpath>
+            <pathelement location="${jar.name}" />
+            <pathelement path='${test.classpath}' />
+        </classpath>
+    </taskdef>
+	
   <property name="output.dir" location="testoutput"/>
   <pathconvert dirsep="/" property="file.name">
     <path>



Mime
View raw message