From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B472158094 for ; Tue, 12 Jul 2022 06:56:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81D66E0F4C; Tue, 12 Jul 2022 06:56:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 61387E0F4C for ; Tue, 12 Jul 2022 06:56:39 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E38F335D68 for ; Tue, 12 Jul 2022 06:56:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C77B500 for ; Tue, 12 Jul 2022 06:56:37 +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: <1657608986.6a37ee83a847c9e108e140c1445dc261d5e3253a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild X-VCS-Directories: media-libs/openjpeg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6a37ee83a847c9e108e140c1445dc261d5e3253a X-VCS-Branch: master Date: Tue, 12 Jul 2022 06:56:37 +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: d87e1b4d-7cce-4049-a356-5f48ee8cc789 X-Archives-Hash: f5f4eac126fcda0cb13d206184021cfb commit: 6a37ee83a847c9e108e140c1445dc261d5e3253a Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Thu Jul 7 08:27:21 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 12 06:56:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a37ee83 media-libs/openjpeg: rework testing phase Instead of running all the test, and filtering for failures, collect the names of all known failures and skip them. Closes: https://bugs.gentoo.org/856505 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Closes: https://github.com/gentoo/gentoo/pull/26256 Signed-off-by: Sam James gentoo.org> media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild | 63 ++++++---------------------- 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild index b7f5f6918adf..d4f51290425f 100644 --- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild +++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild @@ -74,67 +74,28 @@ multilib_src_test() { return 0 fi - local myctestargs= - pushd "${BUILD_DIR}" > /dev/null || die [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - if [[ -n ${TEST_VERBOSE} ]]; then - myctestargs+=( --extra-verbose --output-on-failure ) - fi - - echo ctest "${myctestargs[@]}" - if ctest "${myctestargs[@]}" ; then - popd > /dev/null || die - einfo "Tests succeeded." - return 0 - fi - - local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" - - # Should never happen - [[ -f "${FAILEDTEST_LOG}" ]] || die "Cannot analyze test failures: LastTestsFailed.log is missing!" - - elog elog "Note: Upstream maintains a list of known test failures." - elog "We will now compare our test results against this list and remove any known failures." + elog "We collect all the known failures and skip them." elog - local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" - cp "${S}/tools/travis-ci/knownfailures-all.txt" "${KNOWN_FAILURES_LIST}" || die - - local ARCH_SPECIFIC_FAILURES= + local toskip=( "${S}"/tools/travis-ci/knownfailures-all.txt ) if use amd64 ; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" + toskip+=( "${S}"/tools/travis-ci/knownfailures-*x86_64*.txt ) elif use x86 || use arm || use arm64; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - fi - - if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]]; then - elog "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." - elog - <"${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die + toskip+=( "${S}"/tools/travis-ci/knownfailures-*i386*.txt ) fi - # Logic copied from $S/tools/travis-ci/run.sh - local FAILEDTEST= - local HAS_UNKNOWN_TEST_FAILURES=0 - - while read FAILEDTEST; do - # is this failure known? - if grep -xq "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" ; then - elog "Test '${FAILEDTEST}' is known to fail, ignoring ..." - else - eerror "New/unknown test failure found: '${FAILEDTEST}'" - HAS_UNKNOWN_TEST_FAILURES=1 - fi - done < <(awk -F: '{ print $2 }' "${FAILEDTEST_LOG}") - - [[ ${HAS_UNKNOWN_TEST_FAILURES} -eq 0 ]] || die "Test suite failed. New/unknown test failure(s) found!" + local exp=$(sort "${toskip[@]}" | uniq | tr '\n' '|'; assert) + popd > /dev/null || die - elog - elog "Test suite passed. No new/unknown test failure(s) found!" + local myctestargs=() + if [[ -n ${TEST_VERBOSE} ]]; then + myctestargs+=( --extra-verbose --output-on-failure ) + fi + myctestargs+=( -E "(${exp::-1})" ) - popd > /dev/null || die - return 0 + cmake_src_test }