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 A631D158086 for ; Mon, 8 Nov 2021 13:02:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7CA72BC11A; Mon, 8 Nov 2021 13:02:37 +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 pigeon.gentoo.org (Postfix) with ESMTPS id AAF022BC11A for ; Mon, 8 Nov 2021 13:02:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C34AD342F2B for ; Mon, 8 Nov 2021 13:02:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F145A1DC for ; Mon, 8 Nov 2021 13:02:31 +0000 (UTC) From: "Andrew 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, "Andrew Ammerlaan" Message-ID: <1636351664.4930f4d334fbc586c0c968e0e8159e8c28a610f2.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-util/gammaray/, dev-util/gammaray/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch dev-util/gammaray/gammaray-2.11.3.ebuild X-VCS-Directories: dev-util/gammaray/files/ dev-util/gammaray/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 4930f4d334fbc586c0c968e0e8159e8c28a610f2 X-VCS-Branch: master Date: Mon, 8 Nov 2021 13:02:31 +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: 3befe0e8-4260-4fff-82fe-a856c9be18ec X-Archives-Hash: 6edb66cf164bd03a278d926513e45c56 commit: 4930f4d334fbc586c0c968e0e8159e8c28a610f2 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Mon Nov 8 06:04:05 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Nov 8 06:07:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4930f4d3 dev-util/gammaray: fix tests Closes: https://bugs.gentoo.org/784203 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> .../files/gammaray-2.11.3-deselect-tests.patch | 45 ++++++++++++++++++++++ dev-util/gammaray/gammaray-2.11.3.ebuild | 27 +++++++------ 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch b/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch new file mode 100644 index 000000000..801629e8a --- /dev/null +++ b/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch @@ -0,0 +1,45 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -288,17 +288,6 @@ + gammaray_add_test(earlyexittest earlyexittest.cpp) + target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher) + target_link_libraries(earlyexittest gammaray_core gammaray_launcher) +- +- if(HAVE_QT_WIDGETS) +- gammaray_add_test(launchertest launchertest.cpp) +- target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher) +- target_link_libraries(launchertest gammaray_core gammaray_launcher) +- endif() +- +- if(TARGET gammaray_client) +- gammaray_add_test(clientconnectiontest clientconnectiontest.cpp) +- target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client) +- endif() + endif() + + # +@@ -419,14 +408,6 @@ + endif() + + if(Qt5Quick_FOUND) +- gammaray_add_quick_test(quickinspectortest +- quickinspectortest.cpp +- quickinspectortest.qrc +- $ +- ) +- target_include_directories(quickinspectortest SYSTEM PRIVATE ${Qt5Quick_PRIVATE_INCLUDE_DIRS}) +- target_link_libraries(quickinspectortest gammaray_core gammaray_quickinspector_shared Qt5::Quick) +- + gammaray_add_quick_test(quickinspectortest2 + quickinspectortest2.cpp + quickinspectortest.qrc +@@ -438,9 +419,6 @@ + if(NOT Qt5Quick_VERSION VERSION_LESS 5.9.3) + add_test(NAME quickinspectortest2_softwarecontext COMMAND quickinspectortest2) + set_tests_properties(quickinspectortest2_softwarecontext PROPERTIES ENVIRONMENT "QT_QUICK_BACKEND=softwarecontext") +- +- add_test(NAME quickinspectortest_softwarecontext COMMAND quickinspectortest) +- set_tests_properties(quickinspectortest_softwarecontext PROPERTIES ENVIRONMENT "QT_QUICK_BACKEND=softwarecontext") + endif() + + gammaray_add_quick_test(quickinspectorpickingtest diff --git a/dev-util/gammaray/gammaray-2.11.3.ebuild b/dev-util/gammaray/gammaray-2.11.3.ebuild index 98c015610..d31d81afc 100644 --- a/dev-util/gammaray/gammaray-2.11.3.ebuild +++ b/dev-util/gammaray/gammaray-2.11.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 CMAKE_REMOVE_MODULES_LIST=( BackwardConfig ) -inherit cmake optfeature xdg +inherit cmake optfeature virtualx xdg DESCRIPTION="High-level runtime introspection tool for Qt applications" HOMEPAGE="https://www.kdab.com/gammaray https://github.com/KDAB/GammaRay" @@ -19,12 +19,9 @@ fi LICENSE="BSD-2 GPL-2+ MIT" SLOT=0 -IUSE="3d bluetooth designer doc geolocation printsupport script scxml svg test qml wayland webengine" - -# broken tests -RESTRICT="test" -DOCS=( CHANGES CONTRIBUTORS.txt README.txt ) +IUSE="3d bluetooth designer doc geolocation printsupport script scxml svg test qml wayland webengine" +RESTRICT="!test? ( test )" # TODO: fix automagic sci-libs/vtk (and many other) dependencies RDEPEND=" @@ -52,11 +49,15 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " +DOCS=( CHANGES CONTRIBUTORS.txt README.txt ) + +PATCHES=( "${FILESDIR}"/${P}-deselect-tests.patch ) + src_prepare(){ - sed -i \ - -e "/BackwardConfig.cmake/d" \ - -e "/set(KDE_INSTALL_USE_QT_SYS_PATHS/d" -i CMakeLists.txt || die sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die + sed -i CMakeLists.txt \ + -e "/BackwardConfig.cmake/d" \ + -e "/set(KDE_INSTALL_USE_QT_SYS_PATHS/d" || die cmake_src_prepare } @@ -85,15 +86,17 @@ src_configure(){ -DGAMMARAY_BUILD_DOCS=$(usex doc) -DGAMMARAY_BUILD_UI=ON -DGAMMARAY_DISABLE_FEEDBACK=ON - - # fix install paths -# -DDOC_INSTALL_DIR="doc/${PF}" -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) cmake_src_configure } +src_test() { +# export QT_QPA_PLATFORM=offscreen + virtx cmake_src_test +} + src_install() { cmake_src_install rm -r "${ED}"/usr/share/doc/${PN} || die