[Cmake-commits] CMake branch, next, updated. v2.8.9-905-g7ad210c
Rolf Eike Beer
eike at sf-mail.de
Sun Sep 30 13:50:48 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 7ad210cae6c850b0f29cf7a21e677387fb60271f (commit)
via 6e8edf3b49318ff6b6d33721a086fd640c23442e (commit)
via 08cc2ea35460cf4f7ea49b6986d0c88979f8ac49 (commit)
from 1d6f7313b414af57d947338f66e84e0bd694e426 (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=7ad210cae6c850b0f29cf7a21e677387fb60271f
commit 7ad210cae6c850b0f29cf7a21e677387fb60271f
Merge: 1d6f731 6e8edf3
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 13:50:47 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 30 13:50:47 2012 -0400
Merge topic 'test-ctest-memcheck' into next
6e8edf3 remove knowledge about parent directories from tests
08cc2ea fix wrong file name match on Windows
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e8edf3b49318ff6b6d33721a086fd640c23442e
commit 6e8edf3b49318ff6b6d33721a086fd640c23442e
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 19:50:37 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Sep 30 19:50:37 2012 +0200
remove knowledge about parent directories from tests
diff --git a/Tests/CTestTestMemcheck/DummyBC/test.cmake.in b/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
index 6c18bc7..ae490cd 100644
--- a/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckDummyBC")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/DummyBC")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/DummyBC")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/DummyBC")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/DummyBC")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
@@ -15,7 +15,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
find_program(CTEST_MEMORYCHECK_COMMAND
NAMES BC
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
diff --git a/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in b/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
index 7a442ec..d95b199 100644
--- a/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckDummyPurify")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/DummyPurify")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/DummyPurify")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/DummyPurify")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/DummyPurify")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
@@ -15,7 +15,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
find_program(CTEST_MEMORYCHECK_COMMAND
NAMES purify
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
diff --git a/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
index 0051b21..40fa790 100644
--- a/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckDummyValgrind")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/DummyValgrind")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/DummyValgrind")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/DummyValgrind")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/DummyValgrind")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
@@ -15,7 +15,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
find_program(CTEST_MEMORYCHECK_COMMAND
NAMES valgrind
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
index d004683..390f922 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckDummyValgrindFailPost")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/DummyValgrindFailPost")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/DummyValgrindFailPost")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/DummyValgrindFailPost")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/DummyValgrindFailPost")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
@@ -15,7 +15,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
find_program(CTEST_MEMORYCHECK_COMMAND
NAMES valgrind
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
@@ -27,7 +27,7 @@ find_program(CTEST_MEMORYCHECK_COMMAND
find_program(CTEST_CUSTOM_POST_MEMCHECK
NAMES fail
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
index eaa5b8f..da3b5a7 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckDummyValgrindFailPre")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/DummyValgrindFailPre")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/DummyValgrindFailPre")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/DummyValgrindFailPre")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/DummyValgrindFailPre")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
@@ -15,7 +15,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
find_program(CTEST_MEMORYCHECK_COMMAND
NAMES valgrind
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
@@ -23,11 +23,9 @@ find_program(CTEST_MEMORYCHECK_COMMAND
NO_CMAKE_SYSTEM_PATH
)
-#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
-
find_program(CTEST_CUSTOM_PRE_MEMCHECK
NAMES fail
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
@@ -35,6 +33,8 @@ find_program(CTEST_CUSTOM_PRE_MEMCHECK
NO_CMAKE_SYSTEM_PATH
)
+#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)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
index 5513be5..d6625d4 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckDummyValgrindPrePost")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/DummyValgrindPrePost")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/DummyValgrindPrePost")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/DummyValgrindPrePost")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/DummyValgrindPrePost")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
@@ -15,7 +15,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
find_program(CTEST_MEMORYCHECK_COMMAND
NAMES valgrind
- HINTS "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck"
+ HINTS "@CMAKE_CURRENT_BINARY_DIR@"
NO_DEFAULT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_CMAKE_PATH
@@ -23,10 +23,10 @@ find_program(CTEST_MEMORYCHECK_COMMAND
NO_CMAKE_SYSTEM_PATH
)
-#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
+set(CTEST_CUSTOM_PRE_MEMCHECK "${CTEST_MEMORYCHECK_COMMAND}")
+set(CTEST_CUSTOM_POST_MEMCHECK "${CTEST_MEMORYCHECK_COMMAND}")
-set(CTEST_CUSTOM_PRE_MEMCHECK ${CTEST_MEMORYCHECK_COMMAND})
-set(CTEST_CUSTOM_POST_MEMCHECK ${CTEST_MEMORYCHECK_COMMAND})
+#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
CTEST_START(Experimental)
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
diff --git a/Tests/CTestTestMemcheck/NotExist/test.cmake.in b/Tests/CTestTestMemcheck/NotExist/test.cmake.in
index 5032e75..7c0bc54 100644
--- a/Tests/CTestTestMemcheck/NotExist/test.cmake.in
+++ b/Tests/CTestTestMemcheck/NotExist/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckNotExist")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/NotExist")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/NotExist")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/NotExist")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/NotExist")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
diff --git a/Tests/CTestTestMemcheck/Unknown/test.cmake.in b/Tests/CTestTestMemcheck/Unknown/test.cmake.in
index 5395399..b4dbfce 100644
--- a/Tests/CTestTestMemcheck/Unknown/test.cmake.in
+++ b/Tests/CTestTestMemcheck/Unknown/test.cmake.in
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.1)
# Settings:
-set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck")
+set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
set(CTEST_SITE "@SITE@")
set(CTEST_BUILD_NAME "CTestTest- at BUILDNAME@-MemcheckUnknown")
-set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestMemcheck/Unknown")
-set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestMemcheck/Unknown")
+set(CTEST_SOURCE_DIRECTORY "@CMAKE_CURRENT_SOURCE_DIR@/Unknown")
+set(CTEST_BINARY_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@/Unknown")
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08cc2ea35460cf4f7ea49b6986d0c88979f8ac49
commit 08cc2ea35460cf4f7ea49b6986d0c88979f8ac49
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Sep 30 19:48:07 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Sep 30 19:49:08 2012 +0200
fix wrong file name match on Windows
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 7e06163..118ccf8 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -22,8 +22,10 @@ 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}")
set_tests_properties(CTestTestMemcheckUnknown PROPERTIES
- PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND}\nError in read script: ${CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n$")
+ PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND}\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 | 4 +++-
Tests/CTestTestMemcheck/DummyBC/test.cmake.in | 8 ++++----
Tests/CTestTestMemcheck/DummyPurify/test.cmake.in | 8 ++++----
.../CTestTestMemcheck/DummyValgrind/test.cmake.in | 8 ++++----
.../DummyValgrindFailPost/test.cmake.in | 10 +++++-----
.../DummyValgrindFailPre/test.cmake.in | 14 +++++++-------
.../DummyValgrindPrePost/test.cmake.in | 14 +++++++-------
Tests/CTestTestMemcheck/NotExist/test.cmake.in | 6 +++---
Tests/CTestTestMemcheck/Unknown/test.cmake.in | 6 +++---
9 files changed, 40 insertions(+), 38 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list