diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-12-18 14:24:49 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-12-18 14:24:49 (GMT) |
| commit | bdcce344353d6fa0db0a9c2755170005ce84f901 (patch) | |
| tree | 445cc85d70add66ea44fec1b06f1b0f61e4b36ac | |
| parent | 3e724b2725b3467689c3c09dcacf406230a47017 (diff) | |
| download | CMake-bdcce344353d6fa0db0a9c2755170005ce84f901.zip CMake-bdcce344353d6fa0db0a9c2755170005ce84f901.tar.gz CMake-bdcce344353d6fa0db0a9c2755170005ce84f901.tar.bz2 | |
Fix BadExe test on cygwin.
| -rw-r--r-- | Tests/CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 4c6b333..7defb28 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1267,13 +1267,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel -S "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/test.cmake" -V --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_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES WILL_FAIL ON) - ELSE(CYGWIN) - SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES - PASS_REGULAR_EXPRESSION "BAD_COMMAND") - ENDIF(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" "${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake" |