[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.87 1.88 cmCTestTestHandler.h 1.32 1.33

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestHandler.cxx cmCTestTestHandler.h 
Log Message:
BUG: fix for bug #8174


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.87
retrieving revision 1.88
diff -C 2 -d -r1.87 -r1.88
*** cmCTestTestHandler.cxx	12 Jan 2009 15:37:55 -0000	1.87
--- cmCTestTestHandler.cxx	15 Jan 2009 15:32:56 -0000	1.88
***************
*** 402,406 ****
    this->LogFile = 0;
  
!   this->DartStuff.compile("(<DartMeasurement.*/DartMeasurement[a-zA-Z]*>)");
  }
  
--- 402,411 ----
    this->LogFile = 0;
  
!   // regex to detect <DartMeasurement>...</DartMeasurement>
!   this->DartStuff.compile(
!     "(<DartMeasurement.*/DartMeasurement[a-zA-Z]*>)");
!   // regex to detect each individual <DartMeasurement>...</DartMeasurement>
!   this->DartStuff1.compile(
!     "(<DartMeasurement[^<]*</DartMeasurement[a-zA-Z]*>)");
  }
  
***************
*** 898,902 ****
          {
          std::string dartString = this->DartStuff.match(1);
!         cmSystemTools::ReplaceString(output, dartString.c_str(),"");
          cres.RegressionImages
            = this->GenerateRegressionImages(dartString);
--- 903,913 ----
          {
          std::string dartString = this->DartStuff.match(1);
!         // keep searching and replacing until none are left
!         while (this->DartStuff1.find(output.c_str()))
!           {
!           // replace the exact match for the string
!           cmSystemTools::ReplaceString(output,
!                                        this->DartStuff1.match(1).c_str(), "");
!           }
          cres.RegressionImages
            = this->GenerateRegressionImages(dartString);

Index: cmCTestTestHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** cmCTestTestHandler.h	7 Jan 2009 15:41:37 -0000	1.32
--- cmCTestTestHandler.h	15 Jan 2009 15:32:56 -0000	1.33
***************
*** 241,244 ****
--- 241,245 ----
  
    std::string GenerateRegressionImages(const std::string& xml);
+   cmsys::RegularExpression DartStuff1;
  
    std::string TestsToRunString;