kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: fix tests where the building cmake doesn't have GET_TEST_PROPERTY 

Alex
This commit is contained in:
Alexander Neundorf 2007-06-27 08:43:06 -04:00
parent 25e97d20ce
commit 07613ff7f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/CMakeLists.txt
View File

@ -621,7 +621,7 @@ IF(BUILD_TESTING)
--output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log" --output-log "${CMake_BINARY_DIR}/Tests/CTestTest3/testOutput.log"
) )
# these tests take a long time, make sure they have it # these tests take a long time, make sure they have it
IF(COMMAND SET_TESTS_PROPERTIES) IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
# if timeouts have not already been set # if timeouts have not already been set
GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT) GET_TEST_PROPERTY(CTestTest TIMEOUT PREVIOUS_TIMEOUT)
IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
@ -637,7 +637,7 @@ IF(BUILD_TESTING)
IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
SET_TESTS_PROPERTIES ( CTestTest3 PROPERTIES TIMEOUT 1500) SET_TESTS_PROPERTIES ( CTestTest3 PROPERTIES TIMEOUT 1500)
ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
ENDIF(COMMAND SET_TESTS_PROPERTIES) ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS) ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
IF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode) IF("${CMAKE_TEST_GENERATOR}" MATCHES Xcode)