[jboss-svn-commits] JBL Code SVN: r5651 - in labs/jbossesb/trunk/product: . core core/common/tests core/listeners/tests core/services/tests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 9 13:06:32 EDT 2006
Author: tfennelly
Date: 2006-08-09 13:06:27 -0400 (Wed, 09 Aug 2006)
New Revision: 5651
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/build.xml
labs/jbossesb/trunk/product/core/common/tests/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
Log:
More fixes to the instrumented version of the App.
Also added a report generation task "instr-report".
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-08-09 16:57:17 UTC (rev 5650)
+++ labs/jbossesb/trunk/product/build.xml 2006-08-09 17:06:27 UTC (rev 5651)
@@ -237,7 +237,7 @@
</copy>
</target>
- <target name="earinstr" depends="purge,test">
+ <target name="earinstr" depends="purge,compile">
<ant dir="core" target="earinstr"/>
</target>
@@ -273,8 +273,11 @@
</target>
<target name="deployinstr" depends="earinstr">
- <copy file="${org.jboss.esb.internal.dest}/tests/coverage/jbossesb-appl.ear"
+ <copy file="${org.jboss.esb.internal.dest}/tests/coverage/all/jbossesb-appl.ear"
todir="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/deploy"/>
</target>
+ <target name="instr-report">
+ <ant dir="core" target="instr-report"/>
+ </target>
</project>
Modified: labs/jbossesb/trunk/product/core/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/build.xml 2006-08-09 16:57:17 UTC (rev 5650)
+++ labs/jbossesb/trunk/product/core/build.xml 2006-08-09 17:06:27 UTC (rev 5651)
@@ -73,12 +73,50 @@
</ear>
</target>
+ <path id="emma.libs">
+ <fileset dir="../lib/ext" includes="emma*.jar"/>
+ </path>
+ <property name="classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage"/>
+ <taskdef resource="emma_ant.properties" classpathref="emma.libs" />
<target name="earinstr">
<echo message="Building Instrumented App"/>
- <ear destfile="${org.jboss.esb.internal.dest}/tests/coverage/jbossesb-appl.ear" appxml="services/src/META-INF/application.xml">
- <fileset dir="${org.jboss.esb.internal.dest}/tests/coverage" includes="*.jar"/>
+
+ <!-- Instrument everything... -->
+ <delete dir="${coverage.dir}/all" />
+ <mkdir dir="${coverage.dir}/all" />
+ <emma>
+ <instr instrpath="${classes.dir}/common" destdir="${coverage.dir}/all/instr" metadatafile="${coverage.dir}/all/coverage.emma" />
+ </emma>
+ <emma>
+ <instr instrpath="${classes.dir}/listeners" destdir="${coverage.dir}/all/instr" metadatafile="${coverage.dir}/all/coverage.emma" />
+ </emma>
+ <emma>
+ <instr instrpath="${classes.dir}/services" destdir="${coverage.dir}/all/instr" metadatafile="${coverage.dir}/all/coverage.emma" />
+ </emma>
+
+ <!-- Jar everything, including what disn't get intrumented i.e. interfaces etc... -->
+ <jar destfile="${org.jboss.esb.internal.dest}/tests/coverage/all/jbossesb-instr-all.jar">
+ <fileset dir="${classes.dir}/common"/><fileset dir="${classes.dir}/listeners"/><fileset dir="${classes.dir}/services"/>
+ <fileset dir="${coverage.dir}/all/instr" />
+ </jar>
+
+ <ear destfile="${coverage.dir}/all/jbossesb-appl.ear" appxml="services/tests/application.xml">
+ <fileset dir="${coverage.dir}/all/" includes="jbossesb-instr-all.jar"/>
</ear>
</target>
+
+ <target name="instr-report">
+ <emma>
+ <report sort="+block,+name,+method,+class" metrics="method:70,block:80,line:80,class:100">
+ <fileset dir="${coverage.dir}/all/" >
+ <include name="*.emma" />
+ </fileset>
+ <sourcepath><dirset dir="./" includes="common/src,listeners/src,services/src" /></sourcepath>
+ <html outfile="${coverage.dir}/all/index.html" depth="method" columns="name,line,class,method,block"/>
+ </report>
+ </emma>
+ </target>
<!-- =================================================================== -->
<!-- Clean all -->
Modified: labs/jbossesb/trunk/product/core/common/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-09 16:57:17 UTC (rev 5650)
+++ labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-09 17:06:27 UTC (rev 5651)
@@ -88,12 +88,6 @@
<html outfile="${org.jboss.esb.module.tests.coverage.dir}/index.html" depth="method" columns="name,line,class,method,block"/>
</report>
</emma>
-
- <!-- Jar up the instrumented code = plus the uninstrumented interfaces etc from the uninstrumented binaries. -->
- <jar destfile="${org.jboss.esb.internal.dest}/tests/coverage/${org.jboss.esb.common.jar.name}.jar">
- <fileset dir="${org.jboss.esb.module.classes.dir}" />
- <fileset dir="${org.jboss.esb.module.classes.instr.dir}" />
- </jar>
</target>
<!-- ====================================================================== -->
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-08-09 16:57:17 UTC (rev 5650)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-08-09 17:06:27 UTC (rev 5651)
@@ -78,12 +78,6 @@
<html outfile="${org.jboss.esb.module.tests.coverage.dir}/index.html" depth="method" columns="name,line,class,method,block"/>
</report>
</emma>
-
- <!-- Jar up the instrumented code = plus the uninstrumented interfaces etc from the uninstrumented binaries. -->
- <jar destfile="${org.jboss.esb.internal.dest}/tests/coverage/${org.jboss.esb.listeners.jar.name}.jar">
- <fileset dir="${org.jboss.esb.module.classes.dir}" />
- <fileset dir="${org.jboss.esb.module.classes.instr.dir}" />
- </jar>
</target>
<!-- ====================================================================== -->
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-08-09 16:57:17 UTC (rev 5650)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-08-09 17:06:27 UTC (rev 5651)
@@ -67,6 +67,14 @@
<property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/services"/>
<property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
+ <delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <mkdir dir="${org.jboss.esb.module.tests.coverage.dir}" />
+ <!-- emma>
+ <instr instrpath="${org.jboss.esb.module.classes.dir}"
+ destdir="${org.jboss.esb.module.classes.instr.dir}"
+ metadatafile="${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
+ </emma -->
+
<!-- Run the tests -->
<antcall target="org.jboss.esb.services.internal.test.exec"/>
@@ -80,18 +88,6 @@
</report>
</emma> -->
- <!-- Jar up the instrumented code = plus the uninstrumented interfaces etc from the uninstrumented binaries. -->
- <delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
- <mkdir dir="${org.jboss.esb.module.tests.coverage.dir}" />
- <emma>
- <instr instrpath="${org.jboss.esb.module.classes.dir}"
- destdir="${org.jboss.esb.module.classes.instr.dir}"
- metadatafile="${org.jboss.esb.module.tests.coverage.dir}/coverage.emma" />
- </emma>
- <jar destfile="${org.jboss.esb.internal.dest}/tests/coverage/jbossesb-services.jar">
- <fileset dir="${org.jboss.esb.module.classes.dir}" />
- <fileset dir="${org.jboss.esb.module.classes.instr.dir}" />
- </jar>
</target>
<!-- ====================================================================== -->
More information about the jboss-svn-commits
mailing list