diff options
Diffstat (limited to 'dev-util/cmake/files/cmake-2.8.10-tests.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.10-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch new file mode 100644 index 00000000000..944e3c56a78 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-tests.patch @@ -0,0 +1,83 @@ +Removes the following tests: + +- DeployQt4, which tries to break sandbox and ignores prefix +- CTest.updatecvs, which fails to commit as root +- TestUpload, which requires network access + +diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt +index b404333..50f4292 100644 +--- a/Tests/CMakeLists.txt ++++ b/Tests/CMakeLists.txt +@@ -271,23 +271,6 @@ if(BUILD_TESTING) + ) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") + +- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) +- # this test also depends on the existence of the standard qtiff plugin +- if(QT4_WORKS AND QT_QTSQL_FOUND) +- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND} +- --build-and-test +- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" +- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" +- --build-generator ${CMAKE_TEST_GENERATOR} +- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} +- --build-project Qt4Deploy +- --build-options +- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} +- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} +- ) +- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") +- endif() +- + endif() + endif() + +@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") + endif() + +- # Test CTest Update with CVS +- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) +- find_package(CVS QUIET) +- else() +- find_program(CVS_EXECUTABLE NAMES cvs) +- set(CVS_FOUND ${CVS_EXECUTABLE}) +- endif() +- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) +- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX) +- if("${CVS_EXECUTABLE}" MATCHES "cygwin") +- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") +- set(CTEST_TEST_UPDATE_CVS 0) +- endif() +- endif() +- if(CTEST_TEST_UPDATE_CVS) +- set(CTestUpdateCVS_DIR "CTest UpdateCVS") +- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" +- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) +- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} +- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" +- ) +- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") +- endif() +- + # Test CTest Update with BZR + find_program(BZR_EXECUTABLE NAMES bzr) + mark_as_advanced(BZR_EXECUTABLE) +@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ + 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/CTestTestConfigFileInBuildDir/test1.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake" + @ONLY ESCAPE_QUOTES) |
