[jboss-svn-commits] JBL Code SVN: r31730 - in labs/jbosstm/trunk: ArjunaCore/arjuna and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Feb 18 10:36:32 EST 2010


Author: jhalliday
Date: 2010-02-18 10:36:31 -0500 (Thu, 18 Feb 2010)
New Revision: 31730

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
   labs/jbosstm/trunk/ArjunaCore/txoj/build.xml
   labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
   labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
   labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
   labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
   labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
   labs/jbosstm/trunk/common/build.xml
   labs/jbosstm/trunk/sharedbuild.xml
Log:
Wire emma coverage report to the build. JBTM-682


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -108,22 +108,7 @@
             </tests>
         </run.tests.macro>
 
-        <emma enabled="${emma.enabled}">
-            <report>
-                <fileset dir="${build.dir}" >
-                    <include name="coverage.ec"/>
-                    <include name="metadata.emma"/>
-                </fileset>
-            	   <sourcepath>
-            	     <dirset dir="${src.dir}"/>
-            	   </sourcepath>
-                <txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
-                <html outfile="${basedir}/${build.dir}/emma/coverage.html" />
-                <sourcepath>
-                    <dirset dir="${src.dir}"/>
-                </sourcepath>
-            </report>
-        </emma>
+        <emma.report.macro/>
         
     </target>
 

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -125,6 +125,8 @@
             </tests>
         </run.tests.macro>
 
+        <emma.report.macro/>
+        
     </target>
 
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/txoj/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -42,6 +42,8 @@
             </tests>
         </run.tests.macro>
 
+        <emma.report.macro/>
+        
     </target>
 
 </project>
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -59,6 +59,9 @@
                 </fileset>
             </tests>
         </run.tests.macro>
+
+        <emma.report.macro/>
+        
     </target>
 
 </project>
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -64,6 +64,9 @@
                 </fileset>
             </tests>
         </run.tests.macro>
+
+        <emma.report.macro/>
+
     </target>
 
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -77,6 +77,9 @@
                 </fileset>
             </tests>
         </run.tests.macro>
+
+        <emma.report.macro/>
+        
     </target>
 
 </project>
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -115,6 +115,9 @@
                 </fileset>
             </tests>
         </run.tests.macro>
+
+        <emma.report.macro/>
+        
     </target>
 
 </project>
\ No newline at end of file

Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -97,6 +97,9 @@
                 </fileset>
             </tests>
         </run.tests.macro>
+
+        <emma.report.macro/>
+        
     </target>
 
 </project>

Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/common/build.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -56,19 +56,7 @@
             </tests>
         </run.tests.macro>
 
-        <emma enabled="${emma.enabled}">
-            <report>
-                <fileset dir="${build.dir}" >
-                    <include name="coverage.ec"/>
-                    <include name="metadata.emma"/>
-                </fileset>
-                <txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
-                <html outfile="${basedir}/${build.dir}/emma/coverage.html" />
-                <sourcepath>
-                    <dirset dir="${src.dir}"/>
-                </sourcepath>
-            </report>
-        </emma>
+        <emma.report.macro/>
 
     </target>
 

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2010-02-18 14:38:42 UTC (rev 31729)
+++ labs/jbosstm/trunk/sharedbuild.xml	2010-02-18 15:36:31 UTC (rev 31730)
@@ -511,4 +511,25 @@
 
     </macrodef>
 
+    <macrodef name="emma.report.macro">
+        <sequential>
+            <emma enabled="${emma.enabled}">
+                <report>
+                    <fileset dir="${build.dir}" >
+                        <include name="coverage.ec"/>
+                        <include name="metadata.emma"/>
+                    </fileset>
+                    <sourcepath>
+                        <dirset dir="${src.dir}"/>
+                    </sourcepath>
+                    <txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
+                    <html outfile="${basedir}/${build.dir}/emma/coverage.html" />
+                    <sourcepath>
+                        <dirset dir="${src.dir}"/>
+                    </sourcepath>
+                </report>
+            </emma>
+        </sequential>
+    </macrodef>
+
 </project>



More information about the jboss-svn-commits mailing list