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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FCD8138359 for ; Tue, 14 Jul 2020 18:36:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 393AAE0885; Tue, 14 Jul 2020 18:36:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 253BCE0885 for ; Tue, 14 Jul 2020 18:36:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2465234EDB7 for ; Tue, 14 Jul 2020 18:36:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91F69291 for ; Tue, 14 Jul 2020 18:36:28 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1594751726.1353db8f3aaf7cf64945f2e60bc049be0a755e97.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/milou/, kde-plasma/milou/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch kde-plasma/milou/milou-5.19.49.9999.ebuild kde-plasma/milou/milou-9999.ebuild X-VCS-Directories: kde-plasma/milou/files/ kde-plasma/milou/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1353db8f3aaf7cf64945f2e60bc049be0a755e97 X-VCS-Branch: master Date: Tue, 14 Jul 2020 18:36:28 +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: 102928e4-df56-4248-93d5-3ec4d85719d9 X-Archives-Hash: 12304fd2ecef4ed1b0a72e4aa5aaafc9 commit: 1353db8f3aaf7cf64945f2e60bc049be0a755e97 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 14 18:35:22 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 14 18:35:26 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1353db8f kde-plasma/milou: Disable test dir Reported-by: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/732584 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/milou-5.19.80-disable-manual-tests.patch | 29 ++++++++++++++++++++++ kde-plasma/milou/milou-5.19.49.9999.ebuild | 2 ++ kde-plasma/milou/milou-9999.ebuild | 2 ++ 3 files changed, 33 insertions(+) diff --git a/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch new file mode 100644 index 0000000000..a9e3b029f9 --- /dev/null +++ b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch @@ -0,0 +1,29 @@ +From b239834faa093a972bd7ca33296484609f121a3b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 14 Jul 2020 20:24:01 +0200 +Subject: [PATCH] Disable test dir based on BUILD_TESTING or unavailability of + Qt5::Test + +These tests are manual; an attempt to run them ended in failure. + +Signed-off-by: Andreas Sturmlechner +--- + lib/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index a739c5c..92dd0be 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -39,4 +39,7 @@ install(TARGETS milou EXPORT MilouLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_A + + add_subdirectory(qml) + add_subdirectory(previews) +-add_subdirectory(test) ++ ++if(BUILD_TESTING AND TARGET Qt5::Test) ++ add_subdirectory(test) ++endif() +-- +2.27.0 + diff --git a/kde-plasma/milou/milou-5.19.49.9999.ebuild b/kde-plasma/milou/milou-5.19.49.9999.ebuild index bf21b90201..05f28d80ad 100644 --- a/kde-plasma/milou/milou-5.19.49.9999.ebuild +++ b/kde-plasma/milou/milou-5.19.49.9999.ebuild @@ -31,3 +31,5 @@ DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584 diff --git a/kde-plasma/milou/milou-9999.ebuild b/kde-plasma/milou/milou-9999.ebuild index 176564440e..ebf784628a 100644 --- a/kde-plasma/milou/milou-9999.ebuild +++ b/kde-plasma/milou/milou-9999.ebuild @@ -31,3 +31,5 @@ DEPEND=" >=kde-frameworks/plasma-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584