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 893a1a1bac5d35af89bb4d722fcac03e7ef6d82c (commit)
via 62adfb264b70d0fef60a24275c59b06f4c9281a7 (commit)
from 16a8abfcc8c8e60b86dc81c5439658c6a49edc2b (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=893a1a1bac5d35af89bb4d722fcac03e7ef6d82c
commit 893a1a1bac5d35af89bb4d722fcac03e7ef6d82c
Merge: 16a8abf 62adfb2
Author: Rolf Eike Beer <[email protected]>
AuthorDate: Mon Oct 1 11:51:23 2012 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Oct 1 11:51:23 2012 -0400
Merge topic 'test-ctest-memcheck' into next
62adfb2 CTest: add a test for CTEST_CUSTOM_MEMCHECK_IGNORE
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62adfb264b70d0fef60a24275c59b06f4c9281a7
commit 62adfb264b70d0fef60a24275c59b06f4c9281a7
Author: Rolf Eike Beer <[email protected]>
AuthorDate: Mon Oct 1 17:51:00 2012 +0200
Commit: Rolf Eike Beer <[email protected]>
CommitDate: Mon Oct 1 17:51:00 2012 +0200
CTest: add a test for CTEST_CUSTOM_MEMCHECK_IGNORE
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/CMakeLists.txt
index ca169e5..202564a 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -14,7 +14,8 @@ set_target_properties(pseudo_BC PROPERTIES OUTPUT_NAME BC)
add_executable(memcheck_fail "${CMAKE_CURRENT_BINARY_DIR}/ret1.c")
foreach (_test IN ITEMS Unknown NotExist DummyValgrind DummyValgrindPrePost
- DummyValgrindFailPre DummyValgrindFailPost DummyPurify DummyBC)
+ DummyValgrindFailPre DummyValgrindFailPost DummyPurify DummyBC
+ DummyValgrindIgnoreMemcheck)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/${_test}/test.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/${_test}/test.cmake"
@@ -55,6 +56,10 @@ set_tests_properties(CTestTestMemcheckDummyValgrindFailPost
PROPERTIES
PASS_REGULAR_EXPRESSION "\nProblem running command:
${CMAKE_CURRENT_BINARY_DIR}[^\n]*fail[^\n]*\n(.*\n)?Problem executing
post-memcheck command\\(s\\\).\n(.*\n)?Error in read script:
${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindFailPost/test.cmake\n")
+set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
+ PROPERTIES
+ PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*\n1/1 MemCheck #1:
RunCMake .*\n-- Processing memory checking output: \nMemory checking
results:\n$")
+
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")
diff --git a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
new file mode 100644
index 0000000..eae9910
--- /dev/null
+++ b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required (VERSION 2.6)
+project(CTestTestMemcheckDummyValgrindIgnoreMemcheck)
+include(CTest)
+
+add_test (RunCMake "${CMAKE_COMMAND}")
+add_test (RunCMakeAgain "${CMAKE_COMMAND}")
diff --git
a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CTestConfig.cmake
b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CTestConfig.cmake
new file mode 100644
index 0000000..6eee3e6
--- /dev/null
+++ b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CTestConfig.cmake
@@ -0,0 +1,9 @@
+set (CTEST_PROJECT_NAME "CTestTestMemcheckDummyValgrindIgnoreMemcheck")
+set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
+set (CTEST_DART_SERVER_VERSION "2")
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "www.cdash.org")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PublicDashboard")
+set(CTEST_DROP_SITE_CDASH TRUE)
+
+set(CTEST_CUSTOM_MEMCHECK_IGNORE RunCMakeAgain)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in
b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in
new file mode 100644
index 0000000..caf003d
--- /dev/null
+++ b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.1)
+
+# Settings:
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
+set(CTEST_SITE "@SITE@")
+set(CTEST_BUILD_NAME
"CTestTest-@BUILDNAME@-MemcheckDummyValgrindIgnoreMemcheck")
+
+set(CTEST_SOURCE_DIRECTORY
"@CMAKE_CURRENT_SOURCE_DIR@/DummyValgrindIgnoreMemcheck")
+set(CTEST_BINARY_DIRECTORY
"@CMAKE_CURRENT_BINARY_DIR@/DummyValgrindIgnoreMemcheck")
+set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
+set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
+set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
+set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
+set(CTEST_NOTES_FILES
"${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+
+set(CTEST_MEMORYCHECK_COMMAND "${PSEUDO_VALGRIND}")
+
+#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
+
+CTEST_START(Experimental)
+CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestTestMemcheck/CMakeLists.txt | 7 ++++++-
.../DummyValgrindIgnoreMemcheck/CMakeLists.txt | 6 ++++++
.../DummyValgrindIgnoreMemcheck}/CTestConfig.cmake | 4 +++-
.../test.cmake.in | 6 +++---
4 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644
Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
copy Tests/{CTestTestBadExe =>
CTestTestMemcheck/DummyValgrindIgnoreMemcheck}/CTestConfig.cmake (67%)
copy Tests/CTestTestMemcheck/{DummyValgrind =>
DummyValgrindIgnoreMemcheck}/test.cmake.in (91%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
