[jboss-svn-commits] JBL Code SVN: r37693 - labs/jbosstm/branches/JBOSSTS_4_15_0_Final/qa.

Mon Oct 31 14:54:54 EDT 2011

Author: tomjenkinson
Date: 2011-10-31 14:54:52 -0400 (Mon, 31 Oct 2011)
New Revision: 37693

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/qa/run-tests.xml
Log:
updated to revert back to the previous emma ant definition

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/qa/run-tests.xml
===================================================================

--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/qa/run-tests.xml	2011-10-31 11:51:50 UTC (rev 37692)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/qa/run-tests.xml	2011-10-31 18:54:52 UTC (rev 37693)
@@ -358,34 +358,43 @@
       </junit>
     </sequential>
   </macrodef>
-  <!-- directory that contains emma.jar and emma_ant.jar: -->
-  <path id="emma.lib">
-    <pathelement location="../ext/emma.jar"/>
-    <pathelement location="../build/extlib/emma_ant.jar"/>
-  </path>
-  <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
-  <target name="emmareport">
-    <emma enabled="true">
-      <report>
-        <fileset dir="..">
-          <include name="**/target/**/metadata.emma"/>
-        </fileset>
-        <fileset dir="testoutput">
-          <include name="**/*-coverage.ec"/>
-        </fileset>
-        <fileset dir="..">
-          <include name="**/target/**/coverage.ec"/>
-        </fileset>
-        <sourcepath>
-          <dirset dir="..">
-            <include name="**/classes"/>
-          </dirset>
-        </sourcepath>
-        <txt outfile="testoutput/emma/coverage.txt"/>
-        <html outfile="testoutput/emma/coverage.html"/>
-      </report>
-    </emma>
-  </target>
+    <!-- directory that contains emma.jar and emma_ant.jar: -->
+    <property name="emma.dir" value="../build/extlib" />
+
+    <path id="emma.lib" >
+        <pathelement location="${emma.dir}/emma.jar" />
+        <pathelement location="${emma.dir}/emma_ant.jar" />
+    </path>
+
+    <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+
+    <target name="emmareport">
+        <emma enabled="true">
+            <report>
+
+                <fileset dir=".." >
+                    <include name="**/build/metadata.emma"/>
+                </fileset>
+
+                <fileset dir="testoutput">
+                    <include name="**/*-coverage.ec"/>                    
+                </fileset>
+
+                <fileset dir="..">
+                    <include name="**/build/coverage.ec"/>
+                </fileset>
+
+
+                <sourcepath>
+                    <dirset dir="..">
+                        <include name="**/classes"/>
+                    </dirset>
+                </sourcepath>
+                <txt outfile="testoutput/emma/coverage.txt" />
+                <html outfile="testoutput/emma/coverage.html" />
+            </report>
+        </emma>
+    </target>
   <!--
 
     unused groups, pending cleanup and wiring:

