gentoo auto-resync : 12:07:2022 - 13:33:15

2 files changed, 13 insertions, 52 deletions

diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 237a1e6007ad..bbdaa21ff541 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -12,5 +12,5 @@ EBUILD openjpeg-2.4.0-r1.ebuild 4478 BLAKE2B 46a5f1d2ea203610cb86b081c34477f1e8f
 EBUILD openjpeg-2.4.0-r2.ebuild 4540 BLAKE2B 4687d9a0481facc18df6ca69fd4f6065186cae265b0dfd187faf312a4a6258dc5ba18c2cebd9bbf16c99b3942476983fa5a47ae3ed5a4242854b75e6fd178a31 SHA512 92c25bce2326243646e2c9d7cf95053dd64f4ca2727e4a4c38fe03c58b08840ce95e0ea52d21d850528e4b8732f63cf07c4003b46a4b93cd2f6eae5aebe98779
 EBUILD openjpeg-2.4.0-r3.ebuild 4686 BLAKE2B 35c49e770b00c471d116348e9cc35b1859e7cf4c3326d89e9b050196d1cd74853625454039bd36ea9ef4ff413416c81b8926db28213857b4691e24a918366025 SHA512 1bdea8bca4bae97679388966da4eec19f5e27d6be3fedfd4b55d0c882028d7165613873e454a6445f50ddd34527845214113fecbccf0dcb2374764583ab1da6b
 EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
-EBUILD openjpeg-2.5.0-r2.ebuild 4444 BLAKE2B 8d5ae99be1f331b754b627e9a8b8c1c27a7a0ea91a36b373193ecdeea86710b4cc3576f5db52a4b6a5c57e270c03620f1af6369ea4d681874fcdc4c14564e5f0 SHA512 4ed208c2557421778bb1218638444b84d80361f0053931941492f6f757f0fb16a07f429a97cefe19733c648b5cb22c4e32dab3a4ec217b92004177c414e0ceb5
+EBUILD openjpeg-2.5.0-r2.ebuild 3062 BLAKE2B 1a3e6474e6fa8c692af644c3e31a231b8441eec8fa39e10368a4082223fc3cbb55cea457b6e0912ad7e81b63d9978661ab96e0af082a2b624876b7f9d33c9d01 SHA512 742621309ab9d51941a21b64829cad8470c251ed25ee24b0131e83c6649255beab199c1b39fe50d6173516aec11b8df81f69b8d377b99041de626e37230ebcc9
 MISC metadata.xml 551 BLAKE2B 39647e4fca09d2f613785e350aed813dedb0fb109d718a2ab9b08f7d30d55eaeab4abcf3c58b1434ad239548c966aefac7ebcc3a13d50220ad4a2e59054a75d6 SHA512 a2d0283f5b3d97b6d942d865fa3433f007127dbc63e9479bdf06b8e33c8885dfe6c642cb1b1a8595164fa7fe9961ed44a8c8e70086d7b4dea2f75c1816bbf793
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
 }