From ca31d33151e6a3e1aca7715808e3afa1a39449da Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 25 Jul 2007 16:37:50 -0400 Subject: [PATCH] ENH: fix bug with valgrind output being truncated --- Source/CTest/cmCTestTestHandler.cxx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index e33d62bc4..8026c5ab0 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -784,15 +784,20 @@ void cmCTestTestHandler::ProcessOneTest(cmCTestTestProperties *it, } } - if ( cres.Status == cmCTestTestHandler::COMPLETED ) + // if this is doing MemCheck then all the output needs to be put into + // Output since that it what is parsed to by cmCTestMemCheckHandler + if(!this->MemCheck) { - this->CleanTestOutput(output, static_cast - (this->CustomMaximumPassedTestOutputSize)); - } - else - { - this->CleanTestOutput(output, static_cast - (this->CustomMaximumFailedTestOutputSize)); + if ( cres.Status == cmCTestTestHandler::COMPLETED ) + { + this->CleanTestOutput(output, static_cast + (this->CustomMaximumPassedTestOutputSize)); + } + else + { + this->CleanTestOutput(output, static_cast + (this->CustomMaximumFailedTestOutputSize)); + } } cres.Output = output;