From 1427aa8391fe1a38ebd532487d1d87db0417ae9f Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 23 May 2008 11:28:46 -0400
Subject: [PATCH] BUG: fix for bug 7077 handle DartMeasurement tags with tyep
 text/html

---
 Source/CTest/cmCTestTestHandler.cxx | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 2c70de40c..9a6792e4c 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1543,6 +1543,11 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
     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"
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
@@ -1602,6 +1607,21 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
       cxml.erase(fourattributes.start(),
         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) )
       {
       const std::string& filename =