kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-12260-fix-valgrind-output-parsing' 

eb4af16 CTest: Fixed valgrind output parsing (#12260)
This commit is contained in:
David Cole 2011-09-07 15:38:32 -04:00 committed by CMake Topic Stage
parent de62fd1b6d eb4af16298
commit 05bc6bfb87
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/CTest/cmCTestMemCheckHandler.cxx
View File

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