Modified:
branches/branch_5_0/connector-j/build.xml
Log:
Added packaging of coverage/unit test reports.
Modified: branches/branch_5_0/connector-j/build.xml
===================================================================
--- branches/branch_5_0/connector-j/build.xml 2005-09-07 14:36:02 UTC (rev 4214)
+++ branches/branch_5_0/connector-j/build.xml 2005-09-07 16:52:54 UTC (rev 4215)
@@ -185,7 +185,21 @@
<patternset refid="non.test.sources"/>
</fileset>
</copy>
-
+
+ <mkdir dir="${packageDest}/docs/test-reports/junit"/>
+
+ <copy todir="${packageDest}/docs/test-reports/junit" failonerror="false">
+ <fileset dir="${com.mysql.jdbc.testReports}" includes="**/*"
+ excludes="**/TEST-*.xml"/>
+ </copy>
+
+ <mkdir dir="${packageDest}/docs/test-reports/coverage"/>
+
+ <copy todir="${packageDest}/docs/test-reports/coverage" failonerror="false">
+ <fileset dir="${com.mysql.jdbc.coverageReports}" includes="**/*"
+ excludes="**/*.emma" />
+ </copy>
+
<!-- Fix CRLF for various platforms -->
<copy file="${packageDest}/README" tofile="${packageDest}/README.txt"/>
<copy file="${packageDest}/docs/README.txt" tofile="${packageDest}/docs/README"/>
@@ -896,6 +910,10 @@
<mkdir dir="${junit.results}"/>
<echo message="Running unit tests against ${com.mysql.jdbc.testsuite.url} with jvm ${com.mysql.jdbc.testsuite.jvm.1}"/>
+ <property name="junit.unitregress.results" value="${junit.results}/${test.result.prefix}/unitregress"/>
+ <mkdir dir="${junit.results}/${test.result.prefix}"/>
+ <mkdir dir="${junit.unitregress.results}"/>
+
<junit printSummary="yes" fork="on" jvm="${com.mysql.jdbc.testsuite.jvm}">
<jvmarg value="-Xmx256m"/>
<jvmarg value="-Xverify:none"/> <!-- For java.sql.SavePoint on old JVMs -->
@@ -912,23 +930,35 @@
<pathelement location="${emma.dir}/emma_ant.jar" />
</classpath>
- <formatter type="plain" />
<formatter type="xml"/>
- <batchtest fork="yes" todir="${junit.results}">
+ <batchtest fork="yes" todir="${junit.unitregress.results}">
<fileset dir="${buildDir}/${fullProdName}">
<include name="**/*Test.java" />
<exclude name="**/perf/*.java"/>
</fileset>
</batchtest>
</junit>
+
+ <mkdir dir="${junit.unitregress.results}/report"/>
+
+ <junitreport todir="${junit.unitregress.results}/report">
+ <fileset dir="${junit.unitregress.results}">
+ <include name="**/TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${junit.unitregress.results}/report"/>
+ </junitreport>
</target>
<target name="test.coverage.compliance" depends="instrument">
<property name="com.mysql.jdbc.test.jvm" value="java"/>
<mkdir dir="${junit.results}"/>
<echo message="Running compliance tests against ${com.mysql.jdbc.compliance.url} with jvm ${com.mysql.jdbc.testsuite.jvm}"/>
-
+
+ <property name="junit.compliance.results" value="${junit.results}/${test.result.prefix}/compliance"/>
+ <mkdir dir="${junit.results}/${test.result.prefix}"/>
+ <mkdir dir="${junit.compliance.results}"/>
+
<junit printsummary="yes" jvm="${com.mysql.jdbc.testsuite.jvm}">
<jvmarg value="-Xmx256m"/>
<jvmarg value="-Xverify:none"/> <!-- For java.sql.SavePoint on old JVMs -->
@@ -948,23 +978,33 @@
<formatter type="xml"/>
- <test fork="yes" todir="${junit.results}"
+
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.BatchUpdateTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.ConnectionTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.DatabaseMetaDataTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.EscapeSyntaxTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.PreparedStatementTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.ResultSetMetadataTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.ResultSetTest"/>
- <test fork="yes" todir="${junit.results}"
+ <test fork="yes" todir="${junit.compliance.results}"
name="com.mysql.jdbc.compliance.tests.StatementTest"/>
</junit>
+
+ <mkdir dir="${junit.compliance.results}/report"/>
+
+ <junitreport todir="${junit.compliance.results}/report">
+ <fileset dir="${junit.compliance.results}">
+ <include name="**/TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${junit.compliance.results}/report"/>
+ </junitreport>
</target>
<!-- Runs compliance testsuite against multiple JVMs and
| Thread |
|---|
| • Connector/J commit: r4215 - branches/branch_5_0/connector-j | mmatthews | 7 Sep |
