commit: 3049368a3708d2554b5adda968165ca0c4224325 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 13:28:38 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Apr 20 14:19:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3049368a
dev-qt/qttools: use QT6_RESTRICT_TESTS Bug: https://bugs.gentoo.org/930266 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qttools/qttools-6.7.0.ebuild | 11 ++++++----- dev-qt/qttools/qttools-6.7.9999.ebuild | 11 ++++++----- dev-qt/qttools/qttools-6.9999.ebuild | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dev-qt/qttools/qttools-6.7.0.ebuild b/dev-qt/qttools/qttools-6.7.0.ebuild index f9ea0251c71e..dee5e7804862 100644 --- a/dev-qt/qttools/qttools-6.7.0.ebuild +++ b/dev-qt/qttools/qttools-6.7.0.ebuild @@ -5,6 +5,12 @@ EAPI=8 LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + inherit desktop llvm-r1 optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -29,11 +35,6 @@ REQUIRED_USE=" qdoc? ( clang qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild index 6156f4c02a83..fd8e80ea6380 100644 --- a/dev-qt/qttools/qttools-6.7.9999.ebuild +++ b/dev-qt/qttools/qttools-6.7.9999.ebuild @@ -5,6 +5,12 @@ EAPI=8 LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + inherit desktop llvm-r1 optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -29,11 +35,6 @@ REQUIRED_USE=" qdoc? ( clang qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index 6156f4c02a83..fd8e80ea6380 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -5,6 +5,12 @@ EAPI=8 LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum LLVM_OPTIONAL=1 + +# behaves very badly when qttools is not already installed, also +# other issues to handle (clang tests flaky depending on version, +# and 3rdparty/ tries to FetchContent gtest) +QT6_RESTRICT_TESTS=1 + inherit desktop llvm-r1 optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -29,11 +35,6 @@ REQUIRED_USE=" qdoc? ( clang qml ) " -# behaves very badly when qttools is not already installed, also -# other more minor issues (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -RESTRICT="test" - RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
