BUG: Couple of memcheck bugs: Log files should really be different for test and memcheck. Also make sure to not trunkate the output of the test until the valgrind or any other checking is pefrormed.

2 files changed, 5 insertions, 1 deletions

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 4d4c527..76ed378 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -88,6 +88,8 @@ static const char* cmCTestMemCheckResultLongStrings[] = {
 cmCTestMemCheckHandler::cmCTestMemCheckHandler()
 {
   this->MemCheck = true;
+  this->CustomMaximumPassedTestOutputSize = 0;
+  this->CustomMaximumFailedTestOutputSize = 0;
 }
 
 //----------------------------------------------------------------------
@@ -224,6 +226,8 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
       {
       continue;
       }
+    this->CleanTestOutput(memcheckstr,
+      static_cast<size_t>(this->CustomMaximumFailedTestOutputSize));
     os << "\t<Test Status=\"";
     if ( result->Status == cmCTestMemCheckHandler::COMPLETED )
       {
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index af7ed42..30b0abb 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -457,7 +457,7 @@ int cmCTestTestHandler::ProcessHandler()
     }
 
   cmGeneratedFileStream mLogFile;
-  this->StartLogFile("Tests", mLogFile);
+  this->StartLogFile((this->MemCheck ? "DynamicAnalysis" : "Test"), mLogFile);
   this->LogFile = &mLogFile;
 
   std::vector<cmStdString> passed;