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

BUG: fix for bug 7136

This commit is contained in:
Bill Hoffman 2008-06-17 14:03:49 -04:00
parent ebe5eba1a0
commit aa53857f59
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/CTest/cmCTestTestHandler.cxx
View File

@ -1554,11 +1554,15 @@ 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( cmsys::RegularExpression cdatastart(
"<DartMeasurement" "<DartMeasurement"
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 "*>(<!\\[CDATA\\[([^]]*\\]?[^]]+)*]]>)</DartMeasurement>"); SPACE_REGEX "*>"
SPACE_REGEX "*<!\\[CDATA\\[");
cmsys::RegularExpression cdataend(
"]]>"
SPACE_REGEX "*</DartMeasurement>");
cmsys::RegularExpression measurementfile( cmsys::RegularExpression measurementfile(
"<DartMeasurementFile" "<DartMeasurementFile"
SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
@ -1618,20 +1622,20 @@ 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) ) else if ( cdatastart.find(cxml) && cdataend.find(cxml) )
{ {
ostr ostr
<< "\t\t\t<NamedMeasurement" << "\t\t\t<NamedMeasurement"
<< " " << cdatameasurement.match(1) << "=\"" << " " << cdatastart.match(1) << "=\""
<< cdatameasurement.match(2) << "\"" << cdatastart.match(2) << "\""
<< " " << cdatameasurement.match(3) << "=\"" << " " << cdatastart.match(3) << "=\""
<< cdatameasurement.match(4) << "\"" << cdatastart.match(4) << "\""
<< "><Value>" << cdatameasurement.match(5) << "><Value><![CDATA["
<< "</Value></NamedMeasurement>" << cxml.substr(cdatastart.end(), cdataend.start() - cdatastart.end())
<< "]]></Value></NamedMeasurement>"
<< std::endl; << std::endl;
cxml.erase(cdatastart.start(),
cxml.erase(cdatameasurement.start(), cdataend.end() - cdatastart.start());
cdatameasurement.end() - cdatameasurement.start());
} }
else if ( measurementfile.find(cxml) ) else if ( measurementfile.find(cxml) )
{ {