summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-09-07 19:38:57 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-09-07 19:38:57 (GMT)
commit07eb08439ddeaaab1115acaf717b52319efdfb13 (patch)
treed4aeea40d893a7a0b1212b0d87d8069b188f9d8e
parentc80cbad15226844c2c518e49656fe19fc52d8d33 (diff)
parent339a321e66e142edbb0c6228caf368f09b4a072f (diff)
downloadCMake-07eb08439ddeaaab1115acaf717b52319efdfb13.zip
CMake-07eb08439ddeaaab1115acaf717b52319efdfb13.tar.gz
CMake-07eb08439ddeaaab1115acaf717b52319efdfb13.tar.bz2
Merge topic 'fix-ctesttestcrash-test'
339a321 Tests: Look for "Illegal" or "SegFault" in the output
-rw-r--r--Tests/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9f4e8a3..7f83a47 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1586,7 +1586,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
PASS_REGULAR_EXPRESSION "Failed")
ELSE(CMAKE_TEST_GENERATOR MATCHES "Watcom WMake")
SET_TESTS_PROPERTIES(CTestTestCrash PROPERTIES
- PASS_REGULAR_EXPRESSION "SegFault")
+ PASS_REGULAR_EXPRESSION "(Illegal|SegFault)")
ENDIF(CMAKE_TEST_GENERATOR MATCHES "Watcom WMake")
CONFIGURE_FILE(