You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
3.5 KiB
48 lines
3.5 KiB
From: Modestas Vainius <modax@debian.org>
|
|
Date: Sun, 02 Jun 2013 22:04:53 +0300
|
|
Subject: tests: fix Memcheck tests in a dir with regex special chars (#14183)
|
|
Origin: vendor
|
|
Forwarded: yes
|
|
Bug: http://cmake.org/Bug/view.php?id=14183
|
|
Applied-Upstream: 2.8.12
|
|
|
|
Adapted version of upstream commit ec5b59a3d39ec9687ebde69b299de77992f82518 for 2.8.11.
|
|
|
|
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
|
|
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
|
|
@@ -1,3 +1,6 @@
|
|
+include("@CMAKE_CURRENT_SOURCE_DIR@/../RegexEscapeString.cmake")
|
|
+REGEX_ESCAPE_STRING(CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
|
|
+
|
|
foreach (_retval 0 1)
|
|
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.c" "int main(){return ${_retval};}\n")
|
|
endforeach ()
|
|
@@ -49,7 +52,7 @@ string(REPLACE "+" "\\+" CMAKE_COMMAND_E
|
|
|
|
foreach (_unkn Unknown UnknownQuoted)
|
|
set_tests_properties(CTestTestMemcheck${_unkn} PROPERTIES
|
|
- PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND_ESCAPED}\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/${_unkn}/test.cmake\n")
|
|
+ PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND_ESCAPED}\n(.*\n)?Error in read script: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/${_unkn}/test.cmake\n")
|
|
endforeach ()
|
|
|
|
set_tests_properties(CTestTestMemcheckNotExist PROPERTIES
|
|
@@ -67,7 +70,7 @@ foreach (_pp Pre Post)
|
|
string(TOLOWER ${_pp} _pp_lower)
|
|
set_tests_properties(CTestTestMemcheckDummyValgrindFail${_pp}
|
|
PROPERTIES
|
|
- PASS_REGULAR_EXPRESSION "\nProblem running command: ${CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\n(.*\n)?Problem executing ${_pp_lower}-memcheck command\\(s\\\).\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFail${_pp}/test.cmake\n")
|
|
+ PASS_REGULAR_EXPRESSION "\nProblem running command: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\n(.*\n)?Problem executing ${_pp_lower}-memcheck command\\(s\\\).\n(.*\n)?Error in read script: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFail${_pp}/test.cmake\n")
|
|
endforeach ()
|
|
|
|
set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
|
|
@@ -75,7 +78,7 @@ set_tests_properties(CTestTestMemcheckDu
|
|
PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*\n1/1 MemCheck #1: RunCMake .*${NORMAL_CTEST_OUTPUT}")
|
|
|
|
set_tests_properties(CTestTestMemcheckDummyPurify PROPERTIES
|
|
- PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/test.cmake\n")
|
|
+ PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyPurify/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyPurify/test.cmake\n")
|
|
|
|
set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
|
|
- PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyBC/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error parsing XML in stream at line 1: no element found\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyBC/test.cmake\n")
|
|
+ PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyBC/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error parsing XML in stream at line 1: no element found\n(.*\n)?Error in read script: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyBC/test.cmake\n")
|