summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2019-07-03 23:44:40 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-07-04 21:36:07 +0200
commitd971cf541b30c80cf0504cae6fce2dda82fd66bc (patch)
treeb6a2935fefad6456819e3cf34de7cd32536088a7 /dev-util
parentdev-util/cmake: use correct pattern to undo cmake eclass modifications (diff)
downloadgentoo-d971cf541b30c80cf0504cae6fce2dda82fd66bc.tar.gz
gentoo-d971cf541b30c80cf0504cae6fce2dda82fd66bc.tar.bz2
gentoo-d971cf541b30c80cf0504cae6fce2dda82fd66bc.zip
dev-util/cmake: suppress CPackDEB tests
They would always fail as this is not Debian. Signed-off-by: Rolf Eike Beer <eike@sf-mail.de> Bug: https://bugs.gentoo.org/686482 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/cmake-3.14.3.ebuild4
-rw-r--r--dev-util/cmake/cmake-3.14.5.ebuild4
-rw-r--r--dev-util/cmake/cmake-3.15.0_rc3.ebuild4
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 40c754212745..01f4a37c8333 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 e3507ad6196d..b04b6c2e4330 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 0fb93b78d73f..06184a6bfe5f 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