[Cmake-commits] CMake branch, next, updated. v2.8.9-925-ge407d6a
Rolf Eike Beer
eike at sf-mail.de
Mon Oct 1 11:34:37 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e407d6a8b902b4b3f4e23435f9aaa1aa442fb5c5 (commit)
via 63feca7e62a96d7f185db0a431bbec1fc5b0563e (commit)
via 3ed6a310f0b466165957e0f5d55a27e26f609e48 (commit)
from 44b619785c175ddc768dfa3ecd8dae986491697c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e407d6a8b902b4b3f4e23435f9aaa1aa442fb5c5
commit e407d6a8b902b4b3f4e23435f9aaa1aa442fb5c5
Merge: 44b6197 63feca7
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 1 11:34:34 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 1 11:34:34 2012 -0400
Merge topic 'test-ctest-memcheck' into next
63feca7 directly pass the pseudo memchecker locations to the tests
3ed6a31 fix some stupid typos in the "Unknown" test regex
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63feca7e62a96d7f185db0a431bbec1fc5b0563e
commit 63feca7e62a96d7f185db0a431bbec1fc5b0563e
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 1 17:32:51 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 1 17:32:51 2012 +0200
directly pass the pseudo memchecker locations to the tests
This should fix the dashboards of e.g. MSVC builds where the executables were
in "Release" or similar subdirectories. Also rename the target names to
"pseudo_*" to avoid any potential clashes.
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 31debf4..ca169e5 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -3,12 +3,15 @@ foreach (_retval 0 1)
endforeach ()
# create binaries that we will use as a pseudo memory checker
-add_executable(valgrind "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
-add_executable(purify "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
-add_executable(BC "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
+add_executable(pseudo_valgrind "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
+set_target_properties(pseudo_valgrind PROPERTIES OUTPUT_NAME valgrind)
+add_executable(pseudo_purify "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
+set_target_properties(pseudo_purify PROPERTIES OUTPUT_NAME purify)
+add_executable(pseudo_BC "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
+set_target_properties(pseudo_BC PROPERTIES OUTPUT_NAME BC)
# binary to be used as pre- and post-memcheck command that fails
-add_executable(fail "${CMAKE_CURRENT_BINARY_DIR}/ret1.c")
+add_executable(memcheck_fail "${CMAKE_CURRENT_BINARY_DIR}/ret1.c")
foreach (_test IN ITEMS Unknown NotExist DummyValgrind DummyValgrindPrePost
DummyValgrindFailPre DummyValgrindFailPost DummyPurify DummyBC)
@@ -16,9 +19,14 @@ foreach (_test IN ITEMS Unknown NotExist DummyValgrind DummyValgrindPrePost
"${CMAKE_CURRENT_SOURCE_DIR}/${_test}/test.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/${_test}/test.cmake"
@ONLY ESCAPE_QUOTES)
- add_test(CTestTestMemcheck${_test} ${CMAKE_CTEST_COMMAND}
+ add_test(NAME CTestTestMemcheck${_test}
+ COMMAND ${CMAKE_CTEST_COMMAND}
-S "${CMAKE_CURRENT_BINARY_DIR}/${_test}/test.cmake" -V
--output-log "${CMAKE_CURRENT_BINARY_DIR}/${_test}/testOutput.log"
+ -D PSEUDO_BC=$<TARGET_FILE:pseudo_BC>
+ -D PSEUDO_PURIFY=$<TARGET_FILE:pseudo_purify>
+ -D PSEUDO_VALGRIND=$<TARGET_FILE:pseudo_valgrind>
+ -D ERROR_COMMAND=$<TARGET_FILE:memcheck_fail>
)
endforeach ()
diff --git a/Tests/CTestTestMemcheck/DummyBC/test.cmake.in b/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
index ae490cd..eb1d773 100644
--- a/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
@@ -13,15 +13,7 @@ set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-find_program(CTEST_MEMORYCHECK_COMMAND
- NAMES BC
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_BC}")
#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
diff --git a/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in b/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
index d95b199..4eaea4c 100644
--- a/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
@@ -13,15 +13,7 @@ set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-find_program(CTEST_MEMORYCHECK_COMMAND
- NAMES purify
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_PURIFY}")
#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
diff --git a/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
index 40fa790..3a24ba6 100644
--- a/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
@@ -13,15 +13,7 @@ set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-find_program(CTEST_MEMORYCHECK_COMMAND
- NAMES valgrind
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_VALGRIND}")
#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
index 390f922..8c2895d 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
@@ -13,27 +13,11 @@ set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-find_program(CTEST_MEMORYCHECK_COMMAND
- NAMES valgrind
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_VALGRIND}")
-#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
+set(CTEST_CUSTOM_POST_MEMCHECK "${ERROR_COMMAND}")
-find_program(CTEST_CUSTOM_POST_MEMCHECK
- NAMES fail
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
CTEST_START(Experimental)
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
index da3b5a7..5cd1a53 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
@@ -13,25 +13,9 @@ set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-find_program(CTEST_MEMORYCHECK_COMMAND
- NAMES valgrind
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_VALGRIND}")
-find_program(CTEST_CUSTOM_PRE_MEMCHECK
- NAMES fail
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_CUSTOM_PRE_MEMCHECK "${ERROR_COMMAND}")
#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
diff --git a/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
index d6625d4..f404727 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
@@ -13,15 +13,7 @@ set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
-find_program(CTEST_MEMORYCHECK_COMMAND
- NAMES valgrind
- HINTS "@CMAKE_CURRENT_BINARY_DIR@"
- NO_DEFAULT_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- NO_CMAKE_PATH
- NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH
-)
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_VALGRIND}")
set(CTEST_CUSTOM_PRE_MEMCHECK "${CTEST_MEMORYCHECK_COMMAND}")
set(CTEST_CUSTOM_POST_MEMCHECK "${CTEST_MEMORYCHECK_COMMAND}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ed6a310f0b466165957e0f5d55a27e26f609e48
commit 3ed6a310f0b466165957e0f5d55a27e26f609e48
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 1 17:20:21 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 1 17:20:21 2012 +0200
fix some stupid typos in the "Unknown" test regex
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 61faae3..31debf4 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -23,12 +23,12 @@ foreach (_test IN ITEMS Unknown NotExist DummyValgrind DummyValgrindPrePost
endforeach ()
file(TO_NATIVE_PATH "${CMAKE_COMMAND}" CMAKE_COMMAND_NATIVE)
-string(REPLACE "\\" "\\\\" CMAKE_COMMAND_NATIVE "{CMAKE_COMMAND_NATIVE}")
-string(REPLACE "(" "\\(" CMAKE_COMMAND_NATIVE "{CMAKE_COMMAND_NATIVE}")
-string(REPLACE ")" "\\)" CMAKE_COMMAND_NATIVE "{CMAKE_COMMAND_NATIVE}")
-string(REPLACE "+" "\\+" CMAKE_COMMAND_NATIVE "{CMAKE_COMMAND_NATIVE}")
+string(REPLACE "\\" "\\\\" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
+string(REPLACE "(" "\\(" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
+string(REPLACE ")" "\\)" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
+string(REPLACE "+" "\\+" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
set_tests_properties(CTestTestMemcheckUnknown PROPERTIES
- PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND}\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n")
+ PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND_NATIVE}\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n")
set_tests_properties(CTestTestMemcheckNotExist PROPERTIES
PASS_REGULAR_EXPRESSION "Memory checker \\(MemoryCheckCommand\\) not set, or cannot find the specified program.")
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestTestMemcheck/CMakeLists.txt | 28 ++++++++++++-------
Tests/CTestTestMemcheck/DummyBC/test.cmake.in | 10 +------
Tests/CTestTestMemcheck/DummyPurify/test.cmake.in | 10 +------
.../CTestTestMemcheck/DummyValgrind/test.cmake.in | 10 +------
.../DummyValgrindFailPost/test.cmake.in | 22 ++-------------
.../DummyValgrindFailPre/test.cmake.in | 20 +------------
.../DummyValgrindPrePost/test.cmake.in | 10 +------
7 files changed, 27 insertions(+), 83 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list