[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/

[Thomas Deutschmann]

commit:     ba8b83214bc959f037e7e7ef4ab651bcd754c189
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 15:32:06 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=ba8b8321

dev-db/mysql: 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/mysql/mysql-5.7.36-r1.ebuild | 12 ++----------
 dev-db/mysql/mysql-8.0.27.ebuild    | 13 ++++++-------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/dev-db/mysql/mysql-5.7.36-r1.ebuild 
b/dev-db/mysql/mysql-5.7.36-r1.ebuild
index e0c4de4973dc..53dd2931b101 100644
--- a/dev-db/mysql/mysql-5.7.36-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.36-r1.ebuild
@@ -452,7 +452,6 @@ src_test() {
        }
 
        local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
        local retstatus_tests
 
        if ! use server ; then
@@ -460,12 +459,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))"
 
@@ -693,10 +686,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/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild
index 33ce8cec9041..be17938dfdd9 100644
--- a/dev-db/mysql/mysql-8.0.27.ebuild
+++ b/dev-db/mysql/mysql-8.0.27.ebuild
@@ -349,12 +349,12 @@ src_test() {
        }
 
        local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
        local retstatus_tests
 
-       # Run CTest (test-units)
-       cmake_src_test
-       retstatus_unit=$?
+       if ! use server ; then
+               einfo "Skipping server tests due to minimal build."
+               return 0
+       fi
 
        # Ensure that parallel runs don't die
        export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
@@ -526,10 +526,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"
 }