rebase mysql-connector-java to v. 8.0.26

This commit is contained in:
Zuzana Miklankova 2021-09-16 12:36:13 +02:00
commit 2bd120f829
2 changed files with 22 additions and 14 deletions

View file

@ -3,15 +3,16 @@ From: Ondrej Dubaj <odubaj@redhat.com>
Date: Tue, 11 May 2021 09:45:27 +0200
Subject: [PATCH] Remove coverage test
---
build.xml | 154 ------------------------------------------------------
1 file changed, 154 deletions(-)
build.xml | 158 ------------------------------------------------------
1 file changed, 158 deletions(-)
diff --git a/build.xml b/build.xml
index d1b1ab9..9c8ab7d 100644
index 96c8a0c2..24bfc2f2 100644
--- a/build.xml
+++ b/build.xml
@@ -1266,70 +1266,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1269,76 +1269,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
@ -79,10 +80,16 @@ index d1b1ab9..9c8ab7d 100644
- </testclasses>
- </junitlauncher>
-
<junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
<fileset dir="${com.mysql.cj.testsuite.junit.results}">
<include name="**/TEST-*.xml" />
@@ -1348,96 +1284,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
- <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
- <fileset dir="${com.mysql.cj.testsuite.junit.results}">
- <include name="**/TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${com.mysql.cj.testsuite.junit.results}/report" />
- </junitreport>
<!-- Don't fail the build if we're doing coverage test. -->
<fail message="Tests failed. Check logs and/or reports in '${com.mysql.cj.testsuite.junit.results}'.">
@@ -1351,94 +1281,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
@ -91,9 +98,7 @@ index d1b1ab9..9c8ab7d 100644
- <!-- ********************************* -->
-
-
- <target name="test-coverage"
- description="Runs tests collecting coverage results."
- depends="-setup-test-coverage-agent, test" />
- <target name="test-coverage" description="Runs tests collecting coverage results." depends="-setup-test-coverage-agent, test" />
-
-
- <target name="-set-test-coverage-defaults" depends="-extra-libs-check">
@ -180,5 +185,5 @@ index d1b1ab9..9c8ab7d 100644
<!-- ***** RPM/DEB PACKAGING ***** -->
<!-- ***************************** -->
--
2.30.2
2.31.1