[jboss-svn-commits] JBL Code SVN: r31245 - in labs/jbosstm/trunk: ArjunaJTS/orbportability and 1 other directories.

Wed Jan 27 06:07:33 EST 2010

Author: jhalliday
Date: 2010-01-27 06:07:32 -0500 (Wed, 27 Jan 2010)
New Revision: 31245

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
   labs/jbosstm/trunk/common/build.xml
Log:
Added emma code coverage to the build. JBTM-682


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================

--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2010-01-27 10:12:06 UTC (rev 31244)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2010-01-27 11:07:32 UTC (rev 31245)
@@ -107,6 +107,18 @@
                 <fileset dir="tests/classes" includes="**/recovery/RecoveryManagerStartStopTest.java"/>
             </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" />
+            </report>
+        </emma>
+        
     </target>
 
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml	2010-01-27 10:12:06 UTC (rev 31244)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml	2010-01-27 11:07:32 UTC (rev 31245)
@@ -40,7 +40,7 @@
     </target>
 
     <target name="compile" depends="init">
-        <compile.macro includeant="true"/>
+        <compile.macro includeant="true" includeemma="false"/>
     </target>
 
     <target name="compile-tests" depends="compile-tests-idl">

Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml	2010-01-27 10:12:06 UTC (rev 31244)
+++ labs/jbosstm/trunk/common/build.xml	2010-01-27 11:07:32 UTC (rev 31245)
@@ -62,9 +62,8 @@
                     <include name="coverage.ec"/>
                     <include name="metadata.emma"/>
                 </fileset>
-                <!-- TODO emma incorrectly resolves this as <tsroot>/build not <tsroot>/common/build - investigate/workaround -->
-                <txt outfile="${build.dir}/emma/coverage.txt" />
-                <html outfile="${build.dir}/emma/coverage.html" />
+                <txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
+                <html outfile="${basedir}/${build.dir}/emma/coverage.html" />
             </report>
         </emma>
 

