gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-db/mysql: don't run ctest manually

Browse Source 
ctest are already part of mysql-test suite.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
This commit is contained in:
Thomas Deutschmann
2021-11-18 16:32:06 +01:00
parent 5841df747f
commit ba8b83214b
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dev-db/mysql/mysql-5.7.36-r1.ebuild
View File

@@ -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"
}

13
dev-db/mysql/mysql-8.0.27.ebuild
View File

@@ -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"
}