/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.10-tests.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.10-tests.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sat Oct 19 12:18:58 2013 UTC (8 months, 3 weeks ago) by johu
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 Removes the following tests:
2
3 - DeployQt4, which tries to break sandbox and ignores prefix
4 - CTest.updatecvs, which fails to commit as root
5 - TestUpload, which requires network access
6
7 diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
8 index b404333..50f4292 100644
9 --- a/Tests/CMakeLists.txt
10 +++ b/Tests/CMakeLists.txt
11 @@ -271,23 +271,6 @@ if(BUILD_TESTING)
12 )
13 list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
14
15 - # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
16 - # this test also depends on the existence of the standard qtiff plugin
17 - if(QT4_WORKS AND QT_QTSQL_FOUND)
18 - add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
19 - --build-and-test
20 - "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
21 - "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
22 - --build-generator ${CMAKE_TEST_GENERATOR}
23 - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
24 - --build-project Qt4Deploy
25 - --build-options
26 - -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
27 - -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
28 - )
29 - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
30 - endif()
31 -
32 endif()
33 endif()
34
35 @@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
36 list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
37 endif()
38
39 - # Test CTest Update with CVS
40 - if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
41 - find_package(CVS QUIET)
42 - else()
43 - find_program(CVS_EXECUTABLE NAMES cvs)
44 - set(CVS_FOUND ${CVS_EXECUTABLE})
45 - endif()
46 - set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
47 - if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
48 - if("${CVS_EXECUTABLE}" MATCHES "cygwin")
49 - message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
50 - set(CTEST_TEST_UPDATE_CVS 0)
51 - endif()
52 - endif()
53 - if(CTEST_TEST_UPDATE_CVS)
54 - set(CTestUpdateCVS_DIR "CTest UpdateCVS")
55 - configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
56 - "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
57 - add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
58 - -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
59 - )
60 - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
61 - endif()
62 -
63 # Test CTest Update with BZR
64 find_program(BZR_EXECUTABLE NAMES bzr)
65 mark_as_advanced(BZR_EXECUTABLE)
66 @@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
67 FAIL_REGULAR_EXPRESSION "SegFault")
68
69 configure_file(
70 - "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
71 - "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
72 - @ONLY ESCAPE_QUOTES)
73 - add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
74 - -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
75 - --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
76 - )
77 - set_tests_properties(CTestTestUpload PROPERTIES
78 - PASS_REGULAR_EXPRESSION "Upload\\.xml")
79 -
80 - configure_file(
81 "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
82 "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
83 @ONLY ESCAPE_QUOTES)

  ViewVC Help
Powered by ViewVC 1.1.20