blob: 64af9d314432d8ab4deb59b6e879591b90037e23 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
--- cmake-2.8.8/Tests/CMakeLists.txt
+++ cmake-2.8.8/Tests/CMakeLists.txt
@@ -273,23 +273,6 @@
)
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()
@@ -1548,30 +1531,6 @@
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
ENDIF(Subversion_FOUND)
- # Test CTest Update with CVS
- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
- FIND_PACKAGE(CVS QUIET)
- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
- SET(CVS_FOUND ${CVS_EXECUTABLE})
- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
- 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("${CVS_EXECUTABLE}" MATCHES "cygwin")
- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
- 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(CTEST_TEST_UPDATE_CVS)
-
# Test CTest Update with BZR
FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
MARK_AS_ADVANCED(BZR_EXECUTABLE)
|
GitWeb
