kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bill Hoffman 2008-05-23 11:28:46 -04:00
parent 20e0d163e0
commit 1427aa8391
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/CTest/cmCTestTestHandler.cxx
View File

@ -1543,6 +1543,11 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
SPACE_REGEX "*>([^<]*)</DartMeasurement>"); 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( cmsys::RegularExpression measurementfile(
"<DartMeasurementFile" "<DartMeasurementFile"
SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
@ -1602,6 +1607,21 @@ std::string cmCTestTestHandler::GenerateRegressionImages(
cxml.erase(fourattributes.start(), cxml.erase(fourattributes.start(),
fourattributes.end() - 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) ) else if ( measurementfile.find(cxml) )
{ {
const std::string& filename = const std::string& filename =