diff --git a/build.xml b/build.xml
index 03efb55f..9bf9abfe 100644
--- a/build.xml
+++ b/build.xml
@@ -306,13 +306,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
<pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />
</path>
- <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
- <classpath>
- <fileset dir="${com.mysql.cj.extra.libs}">
- <include name="**/jacocoant.jar" />
- </fileset>
- </classpath>
- </taskdef>
<!-- ************************* -->
@@ -1182,58 +1175,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
- <local name="com.mysql.cj.testsuite.test.coverage" />
- <condition property="com.mysql.cj.testsuite.test.coverage" value="true" else="false">
- <isset property="com.mysql.cj.coverage.result.dir.final" />
- </condition>
-
- <jacoco:coverage destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
- enabled="${com.mysql.cj.testsuite.test.coverage}">
- <junit printsummary="yes"
- fork="on"
- forkmode="once"
- jvm="${com.mysql.cj.testsuite.jvm.java}"
- errorProperty="com.mysql.cj.testsuite.junit.fail"
- failureProperty="com.mysql.cj.testsuite.junit.fail">
- <jvmarg value="-Xmx1024m" />
-
- <syspropertyset refid="junit.system.properties" />
- <sysproperty key="com.mysql.cj.testsuite.url" value="${com.mysql.cj.testsuite.url}" />
-
- <classpath>
- <fileset dir="${com.mysql.cj.extra.libs}">
- <include name="**/*.jar" />
- <exclude name="**/protobuf-java-2.6.0.jar" />
- </fileset>
- <fileset dir="${com.mysql.cj.build.dir.driver}/lib">
- <include name="**/*.jar" />
- </fileset>
- <pathelement location="${com.mysql.cj.build.dir.driver}" />
- <pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />
- <pathelement path="${com.mysql.cj.testsuite.build.classpath}" />
- <pathelement path="${java.class.path}" />
- </classpath>
-
- <formatter type="xml" />
-
- <test if="${com.mysql.cj.testsuite.test.methods.enabled}"
- name="${com.mysql.cj.testsuite.test.class}"
- methods="${com.mysql.cj.testsuite.test.methods}"
- todir="${com.mysql.cj.testsuite.junit.results}" />
-
- <test if="com.mysql.cj.testsuite.test.class"
- unless="com.mysql.cj.testsuite.test.methods"
- name="${com.mysql.cj.testsuite.test.class}"
- todir="${com.mysql.cj.testsuite.junit.results}" />
-
- <batchtest unless="com.mysql.cj.testsuite.test.class" todir="${com.mysql.cj.testsuite.junit.results}">
- <fileset dir="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}">
- <include name="**/*Test.java" />
- <exclude name="**/perf/*.java" />
- </fileset>
- </batchtest>
- </junit>
- </jacoco:coverage>
<junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
<fileset dir="${com.mysql.cj.testsuite.junit.results}">
@@ -1253,79 +1194,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
- <!-- ********************************* -->
- <!-- ***** TESTING CODE COVERAGE ***** -->
- <!-- ********************************* -->
-
-
- <target name="test-coverage" description="Runs tests collecting coverage results." depends="-set-test-coverage-detaults, test" />
-
-
- <target name="-set-test-coverage-detaults">
- <condition property="com.mysql.cj.coverage.result.dir.final"
- value="${com.mysql.cj.coverage.result.dir}"
- else="${com.mysql.cj.testsuite.build.dir}/coverage">
- <isset property="com.mysql.cj.coverage.result.dir" />
- </condition>
- <condition property="com.mysql.cj.coverage.result.name.final" value="${com.mysql.cj.coverage.result.name}" else="jacoco.exec">
- <isset property="com.mysql.cj.coverage.result.name" />
- </condition>
- </target>
-
-
- <!-- *********************************** -->
- <!-- ***** REPORTING CODE COVERAGE ***** -->
- <!-- *********************************** -->
-
-
- <target name="report-coverage"
- depends="-extra-libs-check, -set-report-coverage-detaults, -jacoco-merge"
- description="Merges coverage results and creates HTML coverage report.">
- <jacoco:report>
- <executiondata>
- <file file="${com.mysql.cj.coverage.merge.result.final}" />
- </executiondata>
-
- <structure name="Connector/J classes">
- <classfiles>
- <fileset dir="${com.mysql.cj.build.dir.driver}">
- <include name="com/mysql/cj/**" />
- <exclude name="com/mysql/cj/x/protobuf/**" />
- </fileset>
- </classfiles>
- <sourcefiles encoding="UTF-8">
- <fileset dir="${com.mysql.cj.build.dir.driver}">
- <include name="com/mysql/cj/**" />
- <exclude name="com/mysql/cj/x/protobuf/**" />
- </fileset>
- </sourcefiles>
- </structure>
-
- <html destdir="${com.mysql.cj.coverage.report.dir.final}" />
-
- </jacoco:report>
- </target>
-
-
- <target name="-jacoco-merge" depends="-set-report-coverage-detaults" if="com.mysql.cj.coverage.merge.files">
- <jacoco:merge destfile="${com.mysql.cj.coverage.merge.result.final}">
- <fileset dir="${com.mysql.cj.coverage.result.dir.final}" includes="${com.mysql.cj.coverage.merge.files}" />
- </jacoco:merge>
- </target>
-
-
- <target name="-set-report-coverage-detaults" depends="-set-test-coverage-detaults">
- <condition property="com.mysql.cj.coverage.merge.result.final"
- value="${com.mysql.cj.coverage.merge.result}"
- else="${com.mysql.cj.coverage.result.dir.final}/jacoco.exec">
- <isset property="com.mysql.cj.coverage.merge.result" />
- </condition>
- <condition property="com.mysql.cj.coverage.report.dir.final"
- value="${com.mysql.cj.coverage.report.dir}"
- else="${com.mysql.cj.coverage.result.dir.final}/report">
- <isset property="com.mysql.cj.coverage.report.dir" />
- </condition>
- </target>
<!-- ***************************** -->