commit:     d971cf541b30c80cf0504cae6fce2dda82fd66bc
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Jul  3 21:44:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 19:36:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d971cf54

dev-util/cmake: suppress CPackDEB tests

They would always fail as this is not Debian.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Bug: https://bugs.gentoo.org/686482
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/cmake/cmake-3.14.3.ebuild     | 4 +++-
 dev-util/cmake/cmake-3.14.5.ebuild     | 4 +++-
 dev-util/cmake/cmake-3.15.0_rc3.ebuild | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-util/cmake/cmake-3.14.3.ebuild 
b/dev-util/cmake/cmake-3.14.3.ebuild
index 40c75421274..01f4a37c833 100644
--- a/dev-util/cmake/cmake-3.14.3.ebuild
+++ b/dev-util/cmake/cmake-3.14.3.ebuild
@@ -119,12 +119,14 @@ cmake_src_test() {
        #    RunCMake.CompilerLauncher: also requires fortran
        #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
        #        debugedit binary is not in the expected location
+       #    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+       #        it can't find a deb package that owns libc
        #    TestUpload, which requires network access
        "${BUILD_DIR}"/bin/ctest \
                -j "$(makeopts_jobs)" \
                --test-load "$(makeopts_loadavg)" \
                ${ctestargs} \
-               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)"
 \
+               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)"
 \
                || die "Tests failed"
 
        popd > /dev/null

diff --git a/dev-util/cmake/cmake-3.14.5.ebuild 
b/dev-util/cmake/cmake-3.14.5.ebuild
index e3507ad6196..b04b6c2e433 100644
--- a/dev-util/cmake/cmake-3.14.5.ebuild
+++ b/dev-util/cmake/cmake-3.14.5.ebuild
@@ -119,12 +119,14 @@ cmake_src_test() {
        #    RunCMake.CompilerLauncher: also requires fortran
        #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
        #        debugedit binary is not in the expected location
+       #    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+       #        it can't find a deb package that owns libc
        #    TestUpload, which requires network access
        "${BUILD_DIR}"/bin/ctest \
                -j "$(makeopts_jobs)" \
                --test-load "$(makeopts_loadavg)" \
                ${ctestargs} \
-               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)"
 \
+               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)"
 \
                || die "Tests failed"
 
        popd > /dev/null

diff --git a/dev-util/cmake/cmake-3.15.0_rc3.ebuild 
b/dev-util/cmake/cmake-3.15.0_rc3.ebuild
index 0fb93b78d73..06184a6bfe5 100644
--- a/dev-util/cmake/cmake-3.15.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.15.0_rc3.ebuild
@@ -119,12 +119,14 @@ cmake_src_test() {
        #    RunCMake.CompilerLauncher: also requires fortran
        #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
        #        debugedit binary is not in the expected location
+       #    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+       #        it can't find a deb package that owns libc
        #    TestUpload, which requires network access
        "${BUILD_DIR}"/bin/ctest \
                -j "$(makeopts_jobs)" \
                --test-load "$(makeopts_loadavg)" \
                ${ctestargs} \
-               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)"
 \
+               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)"
 \
                || die "Tests failed"
 
        popd > /dev/null

Reply via email to