| 1 |
commit: b8461fe9a7c531c3cf46c9a7d500e51ad759fd01 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 24 14:20:28 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 24 14:20:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8461fe9 |
| 7 |
|
| 8 |
dev-util/cmake: restrict RunCMake.CPack_RPM test |
| 9 |
|
| 10 |
Gentoo-bug: 600936 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
|
| 13 |
dev-util/cmake/cmake-3.8.2.ebuild | 4 +++- |
| 14 |
dev-util/cmake/cmake-3.9.0_rc4.ebuild | 4 +++- |
| 15 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild |
| 18 |
index 98921d9a61a..b47015dd5c2 100644 |
| 19 |
--- a/dev-util/cmake/cmake-3.8.2.ebuild |
| 20 |
+++ b/dev-util/cmake/cmake-3.8.2.ebuild |
| 21 |
@@ -111,9 +111,11 @@ cmake_src_test() { |
| 22 |
# CTest.updatecvs: which fails to commit as root |
| 23 |
# Fortran: requires fortran |
| 24 |
# Qt4Deploy, which tries to break sandbox and ignores prefix |
| 25 |
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
| 26 |
+ # debugedit binary is not in the expected location |
| 27 |
# TestUpload, which requires network access |
| 28 |
"${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
| 29 |
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ |
| 30 |
+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ |
| 31 |
|| die "Tests failed" |
| 32 |
|
| 33 |
popd > /dev/null |
| 34 |
|
| 35 |
diff --git a/dev-util/cmake/cmake-3.9.0_rc4.ebuild b/dev-util/cmake/cmake-3.9.0_rc4.ebuild |
| 36 |
index 2f18f973e4b..6362fe81846 100644 |
| 37 |
--- a/dev-util/cmake/cmake-3.9.0_rc4.ebuild |
| 38 |
+++ b/dev-util/cmake/cmake-3.9.0_rc4.ebuild |
| 39 |
@@ -111,9 +111,11 @@ cmake_src_test() { |
| 40 |
# CTest.updatecvs: which fails to commit as root |
| 41 |
# Fortran: requires fortran |
| 42 |
# Qt4Deploy, which tries to break sandbox and ignores prefix |
| 43 |
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
| 44 |
+ # debugedit binary is not in the expected location |
| 45 |
# TestUpload, which requires network access |
| 46 |
"${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
| 47 |
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ |
| 48 |
+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ |
| 49 |
|| die "Tests failed" |
| 50 |
|
| 51 |
popd > /dev/null |
Archives