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 EEB621396D0 for ; Tue, 15 Aug 2017 15:05:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A1841FC058; Tue, 15 Aug 2017 15:05:41 +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 16AFD1FC00B for ; Tue, 15 Aug 2017 15:05:41 +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 25A8C3417B1 for ; Tue, 15 Aug 2017 15:05:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C27897849 for ; Tue, 15 Aug 2017 15:05:38 +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: <1502809413.59f8ceab591f86ca8dcc892885e46336ed4b5e95.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 59f8ceab591f86ca8dcc892885e46336ed4b5e95 X-VCS-Branch: master Date: Tue, 15 Aug 2017 15:05:38 +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-Archives-Salt: 5d5dce37-e131-49e8-aa9a-1ee3191090b8 X-Archives-Hash: e6de7d9377911810171e1177569a7f64 commit: 59f8ceab591f86ca8dcc892885e46336ed4b5e95 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 15 15:03:33 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 15 15:03:33 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59f8ceab kde5.eclass: Re-order unconditional Frameworks tests disabling To produce more compatible forceoptional-recursive tests. eclass/kde5.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index afc990f944..93e4f01277 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -624,11 +624,6 @@ kde5_src_prepare() { fi fi - # in frameworks, tests = manual tests so never build them - if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then - cmake_comment_add_subdirectory tests - fi - # only build unit tests when required if ! use_if_iuse test ; then if [[ ${KDE_TEST} = forceoptional ]] ; then @@ -659,6 +654,11 @@ kde5_src_prepare() { cmake_comment_add_subdirectory autotests test tests fi fi + + # in frameworks, tests = manual tests so never build them + if [[ ${CATEGORY} = kde-frameworks ]] && [[ ${PN} != extra-cmake-modules ]]; then + cmake_comment_add_subdirectory tests + fi } # @FUNCTION: kde5_src_configure