[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/

[Michael Palimaka]

commit:     b8461fe9a7c531c3cf46c9a7d500e51ad759fd01
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 14:20:28 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 14:20:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8461fe9

dev-util/cmake: restrict RunCMake.CPack_RPM test

Gentoo-bug: 600936
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/cmake/cmake-3.8.2.ebuild     | 4 +++-
 dev-util/cmake/cmake-3.9.0_rc4.ebuild | 4 +++-
 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 98921d9a61a..b47015dd5c2 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 2f18f973e4b..6362fe81846 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