Rebase to version 8.0.28

This commit is contained in:
Zuzana Miklankova 2022-01-18 15:13:55 +01:00
commit ceef1d97bc
6 changed files with 52 additions and 44 deletions

View file

@ -1,17 +1,17 @@
From 398f1c3885c565ae080cb40046728612b583d90d Mon Sep 17 00:00:00 2001
From aca78bd6710ba4f7556c44abfb9e7ae6793c8e3d Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Tue, 11 May 2021 09:45:27 +0200
Date: Tue, 18 Jan 2022 14:51:24 +0100
Subject: [PATCH] Remove coverage test
---
build.xml | 157 ------------------------------------------------------
1 file changed, 157 deletions(-)
build.xml | 159 ------------------------------------------------------
1 file changed, 159 deletions(-)
diff --git a/build.xml b/build.xml
index a7d82b62..bd0355b4 100644
index c65df525..cc39d88d 100644
--- a/build.xml
+++ b/build.xml
@@ -1285,76 +1285,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1285,79 +1285,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
@ -32,6 +32,9 @@ index a7d82b62..bd0355b4 100644
- </and>
- </condition>
-
- <!-- ant 1.10.10 and above print report summaries to the console from where test counts can be retrieved. -->
- <antversion property="com.mysql.cj.testsuite.ant.version" atleast="1.10.10" />
-
- <junitlauncher haltOnFailure="false" printSummary="true" failureProperty="com.mysql.cj.testsuite.junit.fail">
- <classpath refid="com.mysql.cj.testsuite.build.classpath" />
-
@ -44,7 +47,7 @@ index a7d82b62..bd0355b4 100644
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" />
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </test>
@ -58,7 +61,7 @@ index a7d82b62..bd0355b4 100644
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" />
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </test>
@ -73,7 +76,7 @@ index a7d82b62..bd0355b4 100644
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" />
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </testclasses>
@ -88,7 +91,7 @@ index a7d82b62..bd0355b4 100644
<!-- 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}'.">
@@ -1367,93 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1370,92 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
@ -178,10 +181,9 @@ index a7d82b62..bd0355b4 100644
- <isset property="com.mysql.cj.coverage.report.dir" />
- </condition>
- </target>
-
<!-- ***************************** -->
<!-- ***** RPM/DEB PACKAGING ***** -->
--
2.31.1
2.34.1