summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-06-25 00:20:28 +1000
committerMichael Palimaka <kensington@gentoo.org>2017-06-25 00:20:45 +1000
commitb8461fe9a7c531c3cf46c9a7d500e51ad759fd01 (patch)
tree8cc46ee009c99f20ec09d89cebfd4ea1964ff25d /dev-util
parentprofiles: drop obsolete cmake mask (diff)
downloadgentoo-b8461fe9a7c531c3cf46c9a7d500e51ad759fd01.tar.gz
gentoo-b8461fe9a7c531c3cf46c9a7d500e51ad759fd01.tar.bz2
gentoo-b8461fe9a7c531c3cf46c9a7d500e51ad759fd01.zip
dev-util/cmake: restrict RunCMake.CPack_RPM test
Gentoo-bug: 600936 Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/cmake-3.8.2.ebuild4
-rw-r--r--dev-util/cmake/cmake-3.9.0_rc4.ebuild4
2 files changed, 6 insertions, 2 deletions
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild
index 98921d9a61a8..b47015dd5c24 100644
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ b/dev-util/cmake/cmake-3.8.2.ebuild
@@ -111,9 +111,11 @@ cmake_src_test() {
# CTest.updatecvs: which fails to commit as root
# Fortran: requires fortran
# Qt4Deploy, which tries to break sandbox and ignores prefix
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+ # debugedit binary is not in the expected location
# TestUpload, which requires network access
"${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
|| die "Tests failed"
popd > /dev/null
diff --git a/dev-util/cmake/cmake-3.9.0_rc4.ebuild b/dev-util/cmake/cmake-3.9.0_rc4.ebuild
index 2f18f973e4b6..6362fe81846d 100644
--- a/dev-util/cmake/cmake-3.9.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.9.0_rc4.ebuild
@@ -111,9 +111,11 @@ cmake_src_test() {
# CTest.updatecvs: which fails to commit as root
# Fortran: requires fortran
# Qt4Deploy, which tries to break sandbox and ignores prefix
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+ # debugedit binary is not in the expected location
# TestUpload, which requires network access
"${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
|| die "Tests failed"
popd > /dev/null