[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.173 1.174
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Dec 18 09:24:54 EST 2009
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv3714
Modified Files:
CMakeLists.txt
Log Message:
Fix BadExe test on cygwin.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.173
retrieving revision 1.174
diff -C 2 -d -r1.173 -r1.174
*** CMakeLists.txt 17 Dec 2009 20:15:34 -0000 1.173
--- CMakeLists.txt 18 Dec 2009 14:24:49 -0000 1.174
***************
*** 1268,1278 ****
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/testOutput.log"
)
IF(CYGWIN)
! SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES WILL_FAIL ON)
! ELSE(CYGWIN)
! SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES
! PASS_REGULAR_EXPRESSION "BAD_COMMAND")
! ENDIF(CYGWIN)
!
CONFIGURE_FILE(
"${CMake_SOURCE_DIR}/Tests/CTestTestParallel/test.cmake.in"
--- 1268,1280 ----
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/testOutput.log"
)
+ SET(CTestTestBadExe_REGEX "BAD_COMMAND")
+ # cygwin can not be made to produce a BAD_COMMAND error
+ # the best we can get from it is a failed test
IF(CYGWIN)
! SET(CTestTestBadExe_REGEX "\\*\\*\\*Failed")
! ENDIF()
! SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES
! PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}")
!
CONFIGURE_FILE(
"${CMake_SOURCE_DIR}/Tests/CTestTestParallel/test.cmake.in"
More information about the Cmake-commits
mailing list