From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B1F71582EF for ; Mon, 10 Mar 2025 00:20:17 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1FB6634314B for ; Mon, 10 Mar 2025 00:20:17 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7D54A1103A8; Mon, 10 Mar 2025 00:20:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 77DEF1103A8 for ; Mon, 10 Mar 2025 00:20:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3088D343026 for ; Mon, 10 Mar 2025 00:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8777B28B3 for ; Mon, 10 Mar 2025 00:20:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741565954.80d9cdbd71de3830f86d3baba60718dbfe9a77c4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql/mysql-8.0.40.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 80d9cdbd71de3830f86d3baba60718dbfe9a77c4 X-VCS-Branch: master Date: Mon, 10 Mar 2025 00:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b58658e8-2b58-4863-80c1-5b6d2602ba0a X-Archives-Hash: 51a20367af783f1efec6b294f789f489 commit: 80d9cdbd71de3830f86d3baba60718dbfe9a77c4 Author: Alfred Wingate protonmail com> AuthorDate: Sun Mar 9 09:23:42 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 10 00:19:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d9cdbd dev-db/mysql: miscellanous test tweaks This is the next stable candidate. Hopefully its less painful to the arch teams. * Use REQUIRED_USE instead of silently skipping tests for when server is disabled. * Allow success despite unstable tests and get more infromation about features in tests. Add instructions on attaching a tarball with logs for test failures. Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Sam James gentoo.org> dev-db/mysql/mysql-8.0.40.ebuild | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dev-db/mysql/mysql-8.0.40.ebuild b/dev-db/mysql/mysql-8.0.40.ebuild index 7138143ad509..5957c41998a9 100644 --- a/dev-db/mysql/mysql-8.0.40.ebuild +++ b/dev-db/mysql/mysql-8.0.40.ebuild @@ -391,11 +391,6 @@ src_test() { einfo "Official test instructions:" einfo "ulimit -n 16500 && USE='perl server' FEATURES='test userpriv' ebuild ..." - if ! use server ; then - ewarn "Skipping server tests due to minimal build!" - return 0 - fi - # Ensure that parallel runs don't die local -x MTR_BUILD_THREAD="$((${RANDOM} % 100))" @@ -429,7 +424,7 @@ src_test() { "${FILESDIR}"/my.cnf-8.0.distro-client \ "${FILESDIR}"/my.cnf-8.0.distro-server \ > "${T}"/my.cnf || die - local -X PATH_CONFIG_FILE="${T}/my.cnf" + local -x PATH_CONFIG_FILE="${T}/my.cnf" # Create directories because mysqladmin might run out of order mkdir -p "${T}"/var-tests{,/log} || die @@ -512,7 +507,7 @@ src_test() { if use debug; then disabled_tests+=( - "innodb.dblwr_unencrypt;0;Known test failure -- no upstream bug yet" + "innodb.dblwr_unencrypt;0;Unstable test" ) fi @@ -588,7 +583,10 @@ src_test() { --force --force-restart \ --vardir="${VARDIR}" --tmpdir="${T}/tmp-tests" \ --skip-test=tokudb --skip-test-list="${T}/disabled.def" \ - --retry-failure=2 --max-test-fail=0 + --max-test-fail=0 \ + --retry=3 --retry-failure=2 \ + --report-unstable-tests \ + --report-features retstatus_tests=$? if [[ "${VARDIR}" != "${T}/var-tests" ]]; then @@ -598,19 +596,22 @@ src_test() { rm -rf "${VARDIR}" 2>/dev/null fi + if [[ "${retstatus_tests}" -ne 0 ]]; then + eerror "Tests failed. When you file a bug, please attach the following items:" + eerror "The file that is created with this command:" + eerror "\t'find ${T}/var-tests -name '*.log' | tar -caf mysql-test-logs.tar.xz --files-from -'" + fi + popd &>/dev/null || die # Cleanup is important for these testcases. pkill -9 -f "${S}/ndb" 2>/dev/null pkill -9 -f "${S}/sql" 2>/dev/null - local failures="" - [[ ${retstatus_tests} -eq 0 ]] || failures="${failures} tests" - # bug #823656 cmake_src_test --test-command "--gtest_death_test_style=threadsafe" - [[ -z "${failures}" ]] || die "Test failures: ${failures}" + [[ "${retstatus_tests}" -ne 0 ]] && die "Test failures: mysql-test-run.pl" einfo "Tests successfully completed" }