[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.68 1.68.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCTestTestHandler.cxx 
Log Message:
ENH: push in changes from head


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -C 2 -d -r1.68 -r1.68.2.1
*** cmCTestTestHandler.cxx	31 Jan 2008 21:33:07 -0000	1.68
--- cmCTestTestHandler.cxx	23 May 2008 20:09:40 -0000	1.68.2.1
***************
*** 1544,1547 ****
--- 1544,1552 ----
      SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
      SPACE_REGEX "*>([^<]*)</DartMeasurement>");
+   cmsys::RegularExpression cdatameasurement(
+     "<DartMeasurement"
+     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
+     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
+     SPACE_REGEX "*>(<!\\[CDATA\\[([^]]*\\]?[^]]+)*]]>)</DartMeasurement>");
    cmsys::RegularExpression measurementfile(
      "<DartMeasurementFile"
***************
*** 1603,1606 ****
--- 1608,1626 ----
          fourattributes.end() - fourattributes.start());
        }
+     else if ( cdatameasurement.find(cxml) )
+       {
+       ostr
+         << "\t\t\t<NamedMeasurement"
+         << " " << cdatameasurement.match(1) << "=\""
+         << cdatameasurement.match(2) << "\""
+         << " " << cdatameasurement.match(3) << "=\""
+         << cdatameasurement.match(4) << "\""
+         << "><Value>" << cdatameasurement.match(5)
+         << "</Value></NamedMeasurement>"
+         << std::endl;
+ 
+       cxml.erase(cdatameasurement.start(),
+         cdatameasurement.end() - cdatameasurement.start());
+       }
      else if ( measurementfile.find(cxml) )
        {