summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/cmake-fix-tests.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/cmake-fix-tests.patch')
-rw-r--r--gnu/packages/patches/cmake-fix-tests.patch120
1 files changed, 0 insertions, 120 deletions
diff --git a/gnu/packages/patches/cmake-fix-tests.patch b/gnu/packages/patches/cmake-fix-tests.patch
deleted file mode 100644
index 732b0023ab..0000000000
--- a/gnu/packages/patches/cmake-fix-tests.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From af0a62dadfb3db25880bc653e2e4c97435a604c9 Mon Sep 17 00:00:00 2001
-From: Efraim Flashner <efraim@flashner.co.il>
-Date: Mon, 29 Aug 2016 20:07:58 +0300
-Subject: [PATCH] cmake-fix-tests
-
----
- Tests/CMakeLists.txt | 83 ++++++++++++++++++++++++++++------------------------
- 1 file changed, 44 insertions(+), 39 deletions(-)
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index f21e430..56014a2 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -416,10 +416,12 @@ if(BUILD_TESTING)
- endif()
-
- # run test for BundleUtilities on supported platforms/compilers
-- if(MSVC OR
-- MINGW OR
-- CMAKE_SYSTEM_NAME MATCHES "Linux" OR
-- CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+# if(MSVC OR
-+# MINGW OR
-+# CMAKE_SYSTEM_NAME MATCHES "Linux" OR
-+# CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+# This test fails on Guix: skip it.
-+ if(FALSE)
- if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake")
-
- add_test(BundleUtilities ${CMAKE_CTEST_COMMAND}
-@@ -2481,30 +2483,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
- PASS_REGULAR_EXPRESSION "Could not find executable"
- FAIL_REGULAR_EXPRESSION "SegFault")
-
-- configure_file(
-- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-- @ONLY ESCAPE_QUOTES)
-- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-- )
-- set_tests_properties(CTestTestUpload PROPERTIES
-- PASS_REGULAR_EXPRESSION "Upload\\.xml")
--
-- configure_file(
-- "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
-- @ONLY ESCAPE_QUOTES)
-- add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
-- -C \${CTEST_CONFIGURATION_TYPE}
-- -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
-- --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
-- )
-- set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
-- PASS_REGULAR_EXPRESSION
-- "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
-- set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
-+# This test requires network connectivity: skip it.
-+# configure_file(
-+# "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-+# "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-+# @ONLY ESCAPE_QUOTES)
-+# add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-+# -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-+# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-+# )
-+# set_tests_properties(CTestTestUpload PROPERTIES
-+# PASS_REGULAR_EXPRESSION "Upload\\.xml")
-+
-+# This test times out
-+# configure_file(
-+# "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in"
-+# "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake"
-+# @ONLY ESCAPE_QUOTES)
-+# add_test(CTestCoverageCollectGCOV ${CMAKE_CTEST_COMMAND}
-+# -C \${CTEST_CONFIGURATION_TYPE}
-+# -S "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake" -VV
-+# --output-log "${CMake_BINARY_DIR}/Tests/CTestCoverageCollectGCOV/testOut.log"
-+# )
-+# set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
-+# PASS_REGULAR_EXPRESSION
-+# "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
-+# set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
-
- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in"
-@@ -2860,17 +2864,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
- set_tests_properties(CTestTestStopTime PROPERTIES
- PASS_REGULAR_EXPRESSION "The stop time has been passed")
-
-- configure_file(
-- "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
-- @ONLY ESCAPE_QUOTES)
-- add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND}
-- -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V
-- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log"
-- )
-- #make sure all 3 subdirs were added
-- set_tests_properties(CTestTestSubdir PROPERTIES
-- PASS_REGULAR_EXPRESSION "0 tests failed out of 3")
-+# This test fails to build 2 of the 3 tests
-+# configure_file(
-+# "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
-+# "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
-+# @ONLY ESCAPE_QUOTES)
-+# add_test(CTestTestSubdir ${CMAKE_CTEST_COMMAND}
-+# -S "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" -V
-+# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/testOutput.log"
-+# )
-+# #make sure all 3 subdirs were added
-+# set_tests_properties(CTestTestSubdir PROPERTIES
-+# PASS_REGULAR_EXPRESSION "0 tests failed out of 3")
-
- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestTimeout/test.cmake.in"
---
-2.9.3
-