[Cmake-commits] [cmake-commits] zach.mullen committed CMakeLists.txt 1.109 1.110
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Sep 21 13:40:43 EDT 2009
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv8400/Tests
Modified Files:
CMakeLists.txt
Log Message:
Re-enabled failing tests; fixed ctest_build output to be consistent in the error condition across different make programs so that these tests would pass.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.109
retrieving revision 1.110
diff -C 2 -d -r1.109 -r1.110
*** CMakeLists.txt 20 Sep 2009 13:42:09 -0000 1.109
--- CMakeLists.txt 21 Sep 2009 17:40:40 -0000 1.110
***************
*** 1053,1074 ****
"${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake"
@ONLY ESCAPE_QUOTES)
! #ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND}
! # -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V
! # --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log"
! # )
! #SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES
! # FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true)
! #CONFIGURE_FILE(
! # "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in"
! # "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake"
! # @ONLY ESCAPE_QUOTES)
! # ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND}
! # -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V
! # --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log"
! # )
! # SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild
! # PASS_REGULAR_EXPRESSION "Could not find executable"
! # FAIL_REGULAR_EXPRESSION "SegFault")
CONFIGURE_FILE(
--- 1053,1074 ----
"${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake"
@ONLY ESCAPE_QUOTES)
! ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND}
! -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V
! --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log"
! )
! SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES
! FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true)
! CONFIGURE_FILE(
! "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in"
! "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake"
! @ONLY ESCAPE_QUOTES)
! ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND}
! -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V
! --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log"
! )
! SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild
! PASS_REGULAR_EXPRESSION "Could not find executable"
! FAIL_REGULAR_EXPRESSION "SegFault")
CONFIGURE_FILE(
More information about the Cmake-commits
mailing list