[Cmake-commits] [cmake-commits] hoffman committed cmCTestMemCheckHandler.cxx 1.22 1.23

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv6165

Modified Files:
	cmCTestMemCheckHandler.cxx 
Log Message:
BUG: fix for bug #8153 add purify suppression file and fix output to not be one big line


Index: cmCTestMemCheckHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMemCheckHandler.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** cmCTestMemCheckHandler.cxx	5 Feb 2009 21:31:37 -0000	1.22
--- cmCTestMemCheckHandler.cxx	27 May 2009 15:14:08 -0000	1.23
***************
*** 495,498 ****
--- 495,514 ----
  
  #ifdef _WIN32
+     if( this->CTest->GetCTestConfiguration(
+           "MemoryCheckSuppressionFile").size() )
+       {
+       if( !cmSystemTools::FileExists(this->CTest->GetCTestConfiguration(
+                                        "MemoryCheckSuppressionFile").c_str()) )
+         {
+         cmCTestLog(this->CTest, ERROR_MESSAGE,
+                    "Cannot find memory checker suppression file: "
+                    << this->CTest->GetCTestConfiguration(
+                      "MemoryCheckSuppressionFile").c_str() << std::endl);
+         return false;
+         }
+       this->MemoryTesterOptions += " /FilterFiles=" +
+         cmSystemTools::EscapeSpaces(this->CTest->GetCTestConfiguration(
+                                       "MemoryCheckSuppressionFile").c_str());
+       }
      this->MemoryTesterOptions += " /SAVETEXTDATA=" + outputFile;
  #else
***************
*** 942,945 ****
--- 958,962 ----
      {
      res.Output += line;
+     res.Output += "\n";
      }
  }