commit: a709c03e832969011d8aef587c4aba1156bdb1e4
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 15:34:01 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 15:34:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a709c03e
dev-db/mariadb: don't run ctest manually
ctest are already part of mysql-test suite.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-db/mariadb/mariadb-10.2.41.ebuild | 12 ++----------
dev-db/mariadb/mariadb-10.3.32.ebuild | 12 ++----------
dev-db/mariadb/mariadb-10.4.22.ebuild | 12 ++----------
dev-db/mariadb/mariadb-10.5.13.ebuild | 12 ++----------
dev-db/mariadb/mariadb-10.6.5.ebuild | 12 ++----------
5 files changed, 10 insertions(+), 50 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.2.41.ebuild
b/dev-db/mariadb/mariadb-10.2.41.ebuild
index d4c13b57f770..e86dd5747adc 100644
--- a/dev-db/mariadb/mariadb-10.2.41.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.41.ebuild
@@ -500,7 +500,6 @@ src_test() {
}
local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
local retstatus_tests
if ! use server ; then
@@ -508,12 +507,6 @@ src_test() {
return 0
fi
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake_src_test
- retstatus_unit=$?
-
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
@@ -615,10 +608,9 @@ src_test() {
pkill -9 -f "${S}/sql" 2>/dev/null
local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
- [[ -z "$failures" ]] || die "Test failures: $failures"
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
einfo "Tests successfully completed"
}
diff --git a/dev-db/mariadb/mariadb-10.3.32.ebuild
b/dev-db/mariadb/mariadb-10.3.32.ebuild
index 761a02e398dd..27f7a4a5ce18 100644
--- a/dev-db/mariadb/mariadb-10.3.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.32.ebuild
@@ -490,7 +490,6 @@ src_test() {
}
local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
local retstatus_tests
if ! use server ; then
@@ -498,12 +497,6 @@ src_test() {
return 0
fi
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake_src_test
- retstatus_unit=$?
-
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
@@ -604,10 +597,9 @@ src_test() {
pkill -9 -f "${S}/sql" 2>/dev/null
local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
- [[ -z "$failures" ]] || die "Test failures: $failures"
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
einfo "Tests successfully completed"
}
diff --git a/dev-db/mariadb/mariadb-10.4.22.ebuild
b/dev-db/mariadb/mariadb-10.4.22.ebuild
index ed81695da272..b11372f1e1d6 100644
--- a/dev-db/mariadb/mariadb-10.4.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.22.ebuild
@@ -504,7 +504,6 @@ src_test() {
}
local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
local retstatus_tests
if ! use server ; then
@@ -512,12 +511,6 @@ src_test() {
return 0
fi
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake_src_test
- retstatus_unit=$?
-
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
@@ -621,10 +614,9 @@ src_test() {
pkill -9 -f "${S}/sql" 2>/dev/null
local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
- [[ -z "$failures" ]] || die "Test failures: $failures"
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
einfo "Tests successfully completed"
}
diff --git a/dev-db/mariadb/mariadb-10.5.13.ebuild
b/dev-db/mariadb/mariadb-10.5.13.ebuild
index 44e113cbb291..04a827332cce 100644
--- a/dev-db/mariadb/mariadb-10.5.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.13.ebuild
@@ -498,7 +498,6 @@ src_test() {
}
local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
local retstatus_tests
if ! use server ; then
@@ -506,12 +505,6 @@ src_test() {
return 0
fi
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake_src_test
- retstatus_unit=$?
-
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
@@ -615,10 +608,9 @@ src_test() {
pkill -9 -f "${S}/sql" 2>/dev/null
local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
- [[ -z "$failures" ]] || die "Test failures: $failures"
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
einfo "Tests successfully completed"
}
diff --git a/dev-db/mariadb/mariadb-10.6.5.ebuild
b/dev-db/mariadb/mariadb-10.6.5.ebuild
index 33afa8f6f23e..714e06139d7f 100644
--- a/dev-db/mariadb/mariadb-10.6.5.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.5.ebuild
@@ -497,7 +497,6 @@ src_test() {
}
local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
local retstatus_tests
if ! use server ; then
@@ -505,12 +504,6 @@ src_test() {
return 0
fi
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake_src_test
- retstatus_unit=$?
-
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
@@ -617,10 +610,9 @@ src_test() {
pkill -9 -f "${S}/sql" 2>/dev/null
local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests"
- [[ -z "$failures" ]] || die "Test failures: $failures"
+ [[ -z "${failures}" ]] || die "Test failures: ${failures}"
einfo "Tests successfully completed"
}
