diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-22 15:14:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-22 15:14:43 (GMT) |
| commit | dbc43eb0f7a776110aad7cc80fdce8c2b044e354 (patch) | |
| tree | f4a6de41fd06683b4e94dfdf87fa1252b706edd8 /Tests | |
| parent | 08bb09a944ecccb5d5f25c847be7b30a70ccf7c4 (diff) | |
| parent | 80ee17d8a49489816ea4e10f5fe10d300bd8a292 (diff) | |
| download | CMake-dbc43eb0f7a776110aad7cc80fdce8c2b044e354.zip CMake-dbc43eb0f7a776110aad7cc80fdce8c2b044e354.tar.gz CMake-dbc43eb0f7a776110aad7cc80fdce8c2b044e354.tar.bz2 | |
Merge topic 'fix_guard_malloc_forbc'
80ee17d8 Tests/CTestTestMemcheck: Tolerate malloc guard in BC output
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CTestTestMemcheck/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt index d16d432..f436706 100644 --- a/Tests/CTestTestMemcheck/CMakeLists.txt +++ b/Tests/CTestTestMemcheck/CMakeLists.txt @@ -225,7 +225,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*${ctest_and_tool_outputs}$") set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES - PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+ Passed +[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n") + PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+ Passed +[0-9]+.[0-9]+ sec\n${guard_malloc_lines}\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n") set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: ${CTEST_ESCAPED_REALPATH_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n") |