[Cmake-commits] CMake branch, next, updated. v2.8.5-1818-g434f8d1

[David Cole]

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  434f8d1ada9f0749ad8b2a8887c5c77ccd206cd3 (commit)
       via  eb4af16298a9b456c0fd8df6e20727ce7f6f422c (commit)
      from  f29a0c14b6a958f584e5af0c3848f943b02e73b0 (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=434f8d1ada9f0749ad8b2a8887c5c77ccd206cd3
commit 434f8d1ada9f0749ad8b2a8887c5c77ccd206cd3
Merge: f29a0c1 eb4af16
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Sep 5 14:55:48 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 5 14:55:48 2011 -0400

    Merge topic 'fix-12260-fix-valgrind-output-parsing' into next
    
    eb4af16 CTest: Fixed valgrind output parsing (#12260)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb4af16298a9b456c0fd8df6e20727ce7f6f422c
commit eb4af16298a9b456c0fd8df6e20727ce7f6f422c
Author:     Johannes Stallkamp <johannes.stallkamp at nisys.de>
AuthorDate: Thu Jun 9 14:15:43 2011 +0200
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Sep 5 14:31:08 2011 -0400

    CTest: Fixed valgrind output parsing (#12260)
    
    Previous code was missing some matches in the output. This commit
    fixes the regular expressions used for output matching to detect
    numbers reported with commas in them, too.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 0612449..f0a98f9 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -672,30 +672,30 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
   cmsys::RegularExpression vgFMM(
     "== .*Mismatched free\\(\\) / delete / delete \\[\\]");
   cmsys::RegularExpression vgMLK1(
-    "== .*[0-9][0-9]* bytes in [0-9][0-9]* blocks are definitely lost"
-   " in loss record [0-9][0-9]* of [0-9]");
+    "== .*[0-9,]+ bytes in [0-9,]+ blocks are definitely lost"
+   " in loss record [0-9,]+ of [0-9,]+");
   cmsys::RegularExpression vgMLK2(
-    "== .*[0-9][0-9]* \\([0-9]*,?[0-9]* direct, [0-9]*,?[0-9]* indirect\\)"
-        " bytes in [0-9][0-9]* blocks are definitely lost"
-    " in loss record [0-9][0-9]* of [0-9]");
+    "== .*[0-9,]+ \\([0-9,]+ direct, [0-9,]+ indirect\\)"
+    " bytes in [0-9,]+ blocks are definitely lost"
+    " in loss record [0-9,]+ of [0-9,]+");
   cmsys::RegularExpression vgPAR(
     "== .*Syscall param .* contains unaddressable byte\\(s\\)");
   cmsys::RegularExpression vgMPK1(
-    "== .*[0-9][0-9]* bytes in [0-9][0-9]* blocks are possibly lost in"
-    " loss record [0-9][0-9]* of [0-9]");
+    "== .*[0-9,]+ bytes in [0-9,]+ blocks are possibly lost in"
+    " loss record [0-9,]+ of [0-9,]+");
   cmsys::RegularExpression vgMPK2(
-    "== .*[0-9][0-9]* bytes in [0-9][0-9]* blocks are still reachable"
-    " in loss record [0-9][0-9]* of [0-9]");
+    "== .*[0-9,]+ bytes in [0-9,]+ blocks are still reachable"
+    " in loss record [0-9,]+ of [0-9,]+");
   cmsys::RegularExpression vgUMC(
     "== .*Conditional jump or move depends on uninitialised value\\(s\\)");
   cmsys::RegularExpression vgUMR1(
-    "== .*Use of uninitialised value of size [0-9][0-9]*");
-  cmsys::RegularExpression vgUMR2("== .*Invalid read of size [0-9][0-9]*");
+    "== .*Use of uninitialised value of size [0-9,]+");
+  cmsys::RegularExpression vgUMR2("== .*Invalid read of size [0-9,]+");
   cmsys::RegularExpression vgUMR3("== .*Jump to the invalid address ");
   cmsys::RegularExpression vgUMR4("== .*Syscall param .* contains "
     "uninitialised or unaddressable byte\\(s\\)");
   cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitialised");
-  cmsys::RegularExpression vgIPW("== .*Invalid write of size [0-9]");
+  cmsys::RegularExpression vgIPW("== .*Invalid write of size [0-9,]+");
   cmsys::RegularExpression vgABR("== .*pthread_mutex_unlock: mutex is "
     "locked by a different thread");
   std::vector<std::string::size_type> nonValGrindOutput;

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake