[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2917-ga946876

[Rolf Eike Beer]

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  a9468769be44aaefbfc10297799e41c09883c101 (commit)
       via  cc5816bbbdaca5b9d768a4be0019cc49f45ff5c6 (commit)
       via  0dd0c3c790f8cd787dcfa667dc3e99c8773d0f90 (commit)
      from  a2b6f569d3d611745baca4017cd3c08094007bd9 (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=a9468769be44aaefbfc10297799e41c09883c101
commit a9468769be44aaefbfc10297799e41c09883c101
Merge: a2b6f56 cc5816b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 06:37:04 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 9 06:37:04 2013 -0400

    Merge topic 'MemChecker-improvements' into next
    
    cc5816b Tests: add a test with custom options passed to valgrind
    0dd0c3c CTest: fix comment documenting cmBoundsCheckerParser class


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc5816bbbdaca5b9d768a4be0019cc49f45ff5c6
commit cc5816bbbdaca5b9d768a4be0019cc49f45ff5c6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 12:24:09 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 9 12:35:51 2013 +0200

    Tests: add a test with custom options passed to valgrind

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 43e0a84..e9d1f43 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -105,6 +105,12 @@ set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE \"\${CMAKE_CURRE
 unset(CMAKELISTS_EXTRA_CODE)
 gen_mc_test(DummyValgrindInvalidSupFile "\${PSEUDO_VALGRIND}")
 
+# CTest will add the logfile option as last option. Tell the dummy memcheck
+# to ignore that argument. This will cause the logfile to be missing, which
+# will be the prove for us that the custom option is indeed used.
+set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"--\")")
+gen_mc_test(DummyValgrindCustomOptions "\${PSEUDO_VALGRIND}")
+
 unset(CTEST_EXTRA_CONFIG)
 gen_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe")
 
@@ -145,3 +151,6 @@ set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
 
 set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
     PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: ${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
+
+set_tests_properties(CTestTestMemcheckDummyValgrindCustomOptions PROPERTIES
+    PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/test.cmake\n")
diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CTestTestMemcheck/memtester.cxx.in
index 64b72d3..4609fa3 100644
--- a/Tests/CTestTestMemcheck/memtester.cxx.in
+++ b/Tests/CTestTestMemcheck/memtester.cxx.in
@@ -28,6 +28,12 @@ main(int argc, char **argv)
     std::string logfile;
     for (int i = 1; i < argc; i++) {
       std::string arg = argv[i];
+      // stop processing options, this allows to force
+      // the logfile to be ignored
+      if (arg == "--")
+        {
+        break;
+        }
       if (arg.find(logarg) == 0)
         {
         if (nextarg)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dd0c3c790f8cd787dcfa667dc3e99c8773d0f90
commit 0dd0c3c790f8cd787dcfa667dc3e99c8773d0f90
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu May 9 12:09:02 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu May 9 12:09:02 2013 +0200

    CTest: fix comment documenting cmBoundsCheckerParser class
    
    This was obviously copied from Source/cmGlobalXCodeGenerator.cxx during
    implementation but the comment was forgotten.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 19c156e..8baa673 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -43,8 +43,7 @@ static CatToErrorType cmCTestMemCheckBoundsChecker[] = {
   {0,0}
 };
 
-// parse the xml file storing the installed version of Xcode on
-// the machine
+// parse the xml file containing the results of last BoundsChecker run
 class cmBoundsCheckerParser : public cmXMLParser
 {
 public:

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx  |    3 +--
 Tests/CTestTestMemcheck/CMakeLists.txt   |    9 +++++++++
 Tests/CTestTestMemcheck/memtester.cxx.in |    6 ++++++
 3 files changed, 16 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake