| 1 |
commit: 9b5037ebc0bb0ca8684ecd637b0bb819cdfab884 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 23:04:14 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 23:04:14 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b5037eb |
| 7 |
|
| 8 |
kde5.eclass: Drop KDE_TESTPATTERN |
| 9 |
|
| 10 |
Never used by many ebuilds, completely unused right now. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/674922 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/kde5.eclass | 13 +++---------- |
| 16 |
1 file changed, 3 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 19 |
index fdabf26e85..d2f8515782 100644 |
| 20 |
--- a/eclass/kde5.eclass |
| 21 |
+++ b/eclass/kde5.eclass |
| 22 |
@@ -120,13 +120,6 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then |
| 23 |
fi |
| 24 |
: ${KDE_QTHELP:=false} |
| 25 |
|
| 26 |
-# @ECLASS-VARIABLE: KDE_TESTPATTERN |
| 27 |
-# @DESCRIPTION: |
| 28 |
-# DANGER: Only touch it if you know what you are doing. |
| 29 |
-# By default, matches autotest(s), unittest(s) and test(s) pattern inside |
| 30 |
-# cmake add_subdirectory calls. |
| 31 |
-: ${KDE_TESTPATTERN:="\(auto|unit\)\?tests\?"} |
| 32 |
- |
| 33 |
# @ECLASS-VARIABLE: KDE_TEST |
| 34 |
# @DESCRIPTION: |
| 35 |
# If set to "false", do nothing. |
| 36 |
@@ -136,7 +129,7 @@ fi |
| 37 |
# If set to "forceoptional", remove a Qt5Test dependency and comment test |
| 38 |
# subdirs from the root CMakeLists.txt in addition to the above. |
| 39 |
# If set to "forceoptional-recursive", remove Qt5Test dependencies and make |
| 40 |
-# test subdirs according to KDE_TESTPATTERN from *any* CMakeLists.txt in ${S} |
| 41 |
+# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in ${S} |
| 42 |
# and below conditional on BUILD_TESTING. This is always meant as a short-term |
| 43 |
# fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream. |
| 44 |
if [[ ${CATEGORY} = kde-frameworks ]]; then |
| 45 |
@@ -579,12 +572,12 @@ kde5_src_prepare() { |
| 46 |
local f pf="${T}/${P}"-tests-optional.patch |
| 47 |
touch ${pf} || die "Failed to touch patch file" |
| 48 |
for f in $(find . -type f -name "CMakeLists.txt" -exec \ |
| 49 |
- grep -l "^\s*add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)" {} \;); do |
| 50 |
+ grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do |
| 51 |
cp ${f} ${f}.old || die "Failed to prepare patch origfile" |
| 52 |
pushd ${f%/*} > /dev/null || die |
| 53 |
punt_bogus_dep Qt5 Test |
| 54 |
sed -i CMakeLists.txt -e \ |
| 55 |
- "/^#/! s/add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \ |
| 56 |
+ "/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \ |
| 57 |
|| die |
| 58 |
popd > /dev/null || die |
| 59 |
diff -Naur ${f}.old ${f} 1>>${pf} |
Archives