Commit 1427aa83 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

BUG: fix for bug 7077 handle DartMeasurement tags with tyep text/html

parent 20e0d163
......@@ -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 =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment