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 8B250158B20 for ; Tue, 04 Feb 2025 13:06:40 +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 69D81342F64 for ; Tue, 04 Feb 2025 13:06:40 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2B52B1102A2; Tue, 04 Feb 2025 13:06:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 20AD91102A2 for ; Tue, 04 Feb 2025 13:06:38 +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 C6DF234164C for ; Tue, 04 Feb 2025 13:06:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2ED382195 for ; Tue, 04 Feb 2025 13:06:36 +0000 (UTC) From: "Nowa Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nowa Ammerlaan" Message-ID: <1738674355.1120f8c8a4e30312f7716de9afd7a507b72d7059.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyside/pyside-6.8.2.ebuild X-VCS-Directories: dev-python/pyside/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 1120f8c8a4e30312f7716de9afd7a507b72d7059 X-VCS-Branch: master Date: Tue, 04 Feb 2025 13:06:36 +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: e5a91ede-e5fc-4ff9-b189-1beb2b7c36fa X-Archives-Hash: c96f2cd243fade6fadd9a96049fda656 commit: 1120f8c8a4e30312f7716de9afd7a507b72d7059 Author: Alfred Wingate protonmail com> AuthorDate: Tue Feb 4 12:45:02 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Tue Feb 4 13:05:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1120f8c8 dev-python/pyside: fix handling for tests * QtQml tests expect QtQuick support. * Add build_dir.txt files to ensure tests use the right build directory. * Explicitly feed --projects so that USE="-core" works with tests. * Add tests of xfail and conditional xfail for numpy tests. Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/40437 Signed-off-by: Nowa Ammerlaan gentoo.org> dev-python/pyside/pyside-6.8.2.ebuild | 44 ++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dev-python/pyside/pyside-6.8.2.ebuild b/dev-python/pyside/pyside-6.8.2.ebuild index b7da42527ea3..20c58849fc06 100644 --- a/dev-python/pyside/pyside-6.8.2.ebuild +++ b/dev-python/pyside/pyside-6.8.2.ebuild @@ -115,6 +115,12 @@ declare -A QT_REQUIREMENTS=( IUSE="${!QT_MODULES[@]} debug doc gles2-only numpy test tools" RESTRICT="!test? ( test )" +# majority of QtQml tests require QtQuick support +REQUIRED_USE=" + test? ( + qml? ( quick ) + ) +" for requirement in ${!QT_REQUIREMENTS[@]}; do REQUIRED_USE+=" ${requirement}? ( ${QT_REQUIREMENTS[${requirement}]} ) " done @@ -233,6 +239,28 @@ python_prepare_all() { sed -e \ 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${LLVM_SLOT}"'/include"))~' \ -i sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die + + # blacklist.txt works like XFAIL + cat <<- EOF >> build_history/blacklist.txt || die + # segfaults with QOpenGLContext::create + [pysidetest::qapp_like_a_macro_test] + linux + # Tries to execute pip install + [pyside6-deploy::test_pyside6_deploy] + linux + [pyside6-android-deploy::test_pyside6_android_deploy] + linux + EOF + + if ! use numpy; then + cat <<- EOF >> build_history/blacklist.txt || die + # Requires numpy support to pass + [sample::array_numpy] + linux + [sample::nontypetemplate] + linux + EOF + fi } python_configure_all() { @@ -437,5 +465,19 @@ python_compile() { } python_test() { - virtx ${EPYTHON} testrunner.py test || die "Tests failed with ${EPYTHON}" + # figure out the build dir + local build_dir build_classifier + build_dir=$(ls -d "${BUILD_DIR}"/build/qfp-*/build/) + build_classifier="${build_dir##${BUILD_DIR}/build/qfp-}" + build_classifier="${build_dir%%/build}" + + # Otherwise it picks the last built directory breaking assumption for multi target builds + mkdir -p build_history/9999-99-99_999999/ || die + cat <<- EOF > build_history/9999-99-99_999999/build_dir.txt || die + ${build_dir} + ${build_classifier} + EOF + + virtx ${EPYTHON} testrunner.py test --projects=shiboken6 $(usev core '--projects=pyside6') || + die "Tests failed with ${EPYTHON}" }