From aa53857f59578258e780eb71eb0b4165c71276c5 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 17 Jun 2008 14:03:49 -0400
Subject: BUG: fix for bug 7136

---
 Source/CTest/cmCTestTestHandler.cxx | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 7a3086e..fe3c3ae 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1554,11 +1554,15 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
     SPACE_REGEX "*>([^<]*)</DartMeasurement>");
-  cmsys::RegularExpression cdatameasurement(
+  cmsys::RegularExpression cdatastart(
     "<DartMeasurement"
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
-    SPACE_REGEX "*>(<!\\[CDATA\\[([^]]*\\]?[^]]+)*]]>)</DartMeasurement>");
+    SPACE_REGEX "*>"
+    SPACE_REGEX "*<!\\[CDATA\\[");
+  cmsys::RegularExpression cdataend(
+    "]]>"
+    SPACE_REGEX "*</DartMeasurement>");
   cmsys::RegularExpression measurementfile(
     "<DartMeasurementFile"
     SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
@@ -1618,20 +1622,20 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
       cxml.erase(fourattributes.start(),
         fourattributes.end() - fourattributes.start());
       }
-    else if ( cdatameasurement.find(cxml) )
+    else if ( cdatastart.find(cxml) && cdataend.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>"
+        << " " << cdatastart.match(1) << "=\""
+        << cdatastart.match(2) << "\""
+        << " " << cdatastart.match(3) << "=\""
+        << cdatastart.match(4) << "\""
+        << "><Value><![CDATA["
+        << cxml.substr(cdatastart.end(), cdataend.start() - cdatastart.end())
+        << "]]></Value></NamedMeasurement>"
         << std::endl;
-
-      cxml.erase(cdatameasurement.start(),
-        cdatameasurement.end() - cdatameasurement.start());
+      cxml.erase(cdatastart.start(),
+        cdataend.end() - cdatastart.start());
       }
     else if ( measurementfile.find(cxml) )
       {
-- 
cgit v0.12