HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 477a752e SB |
1 | --- cmake-3.2.2.orig/Tests/CMakeLists.txt 2015-04-14 01:09:00.000000000 +0800 |
| 2 | +++ cmake-3.2.2/Tests/CMakeLists.txt 2015-04-28 15:02:34.913039742 +0800 | |
| 3 | @@ -342,10 +342,12 @@ | |
| 4 | endif() | |
| 5 | ||
| 6 | # run test for BundleUtilities on supported platforms/compilers | |
| 7 | - if(MSVC OR | |
| 8 | - MINGW OR | |
| 9 | - CMAKE_SYSTEM_NAME MATCHES "Linux" OR | |
| 10 | - CMAKE_SYSTEM_NAME MATCHES "Darwin") | |
| 11 | +# if(MSVC OR | |
| 12 | +# MINGW OR | |
| 13 | +# CMAKE_SYSTEM_NAME MATCHES "Linux" OR | |
| 14 | +# CMAKE_SYSTEM_NAME MATCHES "Darwin") | |
| 15 | +# This test fails on Guix: skip it. | |
| 16 | + if(FALSE) | |
| 17 | if(NOT "${CMAKE_GENERATOR}" STREQUAL "Watcom WMake") | |
| 18 | ||
| 19 | add_test(BundleUtilities ${CMAKE_CTEST_COMMAND} | |
| 20 | @@ -2257,16 +2259,17 @@ | |
| b6a64843 CR |
21 | PASS_REGULAR_EXPRESSION "Could not find executable" |
| 22 | FAIL_REGULAR_EXPRESSION "SegFault") | |
| 23 | ||
| 24 | - configure_file( | |
| 25 | - "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" | |
| 26 | - "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" | |
| 27 | - @ONLY ESCAPE_QUOTES) | |
| 28 | - add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} | |
| 29 | - -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V | |
| 30 | - --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" | |
| 31 | - ) | |
| 32 | - set_tests_properties(CTestTestUpload PROPERTIES | |
| 33 | - PASS_REGULAR_EXPRESSION "Upload\\.xml") | |
| 34 | +# This test requires network connectivity: skip it. | |
| 35 | +# configure_file( | |
| 36 | +# "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in" | |
| 37 | +# "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" | |
| 38 | +# @ONLY ESCAPE_QUOTES) | |
| 39 | +# add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND} | |
| 40 | +# -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V | |
| 41 | +# --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log" | |
| 42 | +# ) | |
| 43 | +# set_tests_properties(CTestTestUpload PROPERTIES | |
| 44 | +# PASS_REGULAR_EXPRESSION "Upload\\.xml") | |
| 45 | ||
| 46 | configure_file( | |
| 477a752e | 47 | "${CMake_SOURCE_DIR}/Tests/CTestCoverageCollectGCOV/test.cmake.in" |