[Cmake-commits] [cmake-commits] king committed cmCTestBuildHandler.cxx 1.69 1.70 cmCTestConfigureHandler.cxx 1.17 1.18 cmCTestCoverageHandler.cxx 1.61 1.62 cmCTestMemCheckHandler.cxx 1.21 1.22 cmCTestTestHandler.cxx 1.90 1.91 cmCTestUpdateHandler.cxx 1.50 1.51
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 5 16:31:39 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv3208/Source/CTest
Modified Files:
cmCTestBuildHandler.cxx cmCTestConfigureHandler.cxx
cmCTestCoverageHandler.cxx cmCTestMemCheckHandler.cxx
cmCTestTestHandler.cxx cmCTestUpdateHandler.cxx
Log Message:
ENH: Create cmXMLSafe to help escapes in XML
This class provides easy syntax to efficiently insert blocks of data
into XML documents with proper escapes. It replaces the old
cmCTest::MakeXMLSafe and cmSystemTools::MakeXMLSafe methods which
allocated extra memory instead of directly streaming the data.
Index: cmCTestConfigureHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestConfigureHandler.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmCTestConfigureHandler.cxx 12 Jan 2009 15:37:55 -0000 1.17
--- cmCTestConfigureHandler.cxx 5 Feb 2009 21:31:37 -0000 1.18
***************
*** 21,24 ****
--- 21,25 ----
#include "cmGeneratedFileStream.h"
#include "cmake.h"
+ #include "cmXMLSafe.h"
#include <cmsys/Process.h>
***************
*** 107,111 ****
<< std::endl;
cmCTestLog(this->CTest, DEBUG, "End" << std::endl);
! os << "<Log>" << cmCTest::MakeXMLSafe(output) << "</Log>" << std::endl;
std::string end_time = this->CTest->CurrentTime();
os << "\t<ConfigureStatus>" << retVal << "</ConfigureStatus>\n"
--- 108,112 ----
<< std::endl;
cmCTestLog(this->CTest, DEBUG, "End" << std::endl);
! os << "<Log>" << cmXMLSafe(output) << "</Log>" << std::endl;
std::string end_time = this->CTest->CurrentTime();
os << "\t<ConfigureStatus>" << retVal << "</ConfigureStatus>\n"
Index: cmCTestMemCheckHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMemCheckHandler.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** cmCTestMemCheckHandler.cxx 2 Feb 2009 18:24:26 -0000 1.21
--- cmCTestMemCheckHandler.cxx 5 Feb 2009 21:31:37 -0000 1.22
***************
*** 25,28 ****
--- 25,29 ----
#include <cmsys/Base64.h>
#include "cmMakefile.h"
+ #include "cmXMLSafe.h"
#include <stdlib.h>
***************
*** 78,83 ****
for(; atts[i] != 0; i+=2)
{
! ostr << " " << this->CTest->MakeXMLSafe(atts[i]).c_str()
! << " - " << this->CTest->MakeXMLSafe(atts[i+1]).c_str() << "\n";
}
ostr << "\n";
--- 79,84 ----
for(; atts[i] != 0; i+=2)
{
! ostr << " " << cmXMLSafe(atts[i])
! << " - " << cmXMLSafe(atts[i+1]) << "\n";
}
ostr << "\n";
***************
*** 314,318 ****
cmCTestTestResult *result = &this->TestResults[cc];
std::string testPath = result->Path + "/" + result->Name;
! os << "\t\t<Test>" << cmCTest::MakeXMLSafe(
this->CTest->GetShortPathToFile(testPath.c_str()))
<< "</Test>" << std::endl;
--- 315,319 ----
cmCTestTestResult *result = &this->TestResults[cc];
std::string testPath = result->Path + "/" + result->Name;
! os << "\t\t<Test>" << cmXMLSafe(
this->CTest->GetShortPathToFile(testPath.c_str()))
<< "</Test>" << std::endl;
***************
*** 611,615 ****
defects ++;
}
! ostr << cmCTest::MakeXMLSafe(*i) << std::endl;
}
--- 612,616 ----
defects ++;
}
! ostr << cmXMLSafe(*i) << std::endl;
}
***************
*** 751,755 ****
}
totalOutputSize += lines[cc].size();
! ostr << cmCTest::MakeXMLSafe(lines[cc]) << std::endl;
}
else
--- 752,756 ----
}
totalOutputSize += lines[cc].size();
! ostr << cmXMLSafe(lines[cc]) << std::endl;
}
else
***************
*** 768,774 ****
<< lines[*i] << std::endl);
cmCTestLog(this->CTest, DEBUG, "after xml safe "
! << cmCTest::MakeXMLSafe(lines[*i]) << std::endl);
! ostr << cmCTest::MakeXMLSafe(lines[*i]) << std::endl;
if(!unlimitedOutput && totalOutputSize >
static_cast<size_t>(this->CustomMaximumFailedTestOutputSize))
--- 769,775 ----
<< lines[*i] << std::endl);
cmCTestLog(this->CTest, DEBUG, "after xml safe "
! << cmXMLSafe(lines[*i]) << std::endl);
! ostr << cmXMLSafe(lines[*i]) << std::endl;
if(!unlimitedOutput && totalOutputSize >
static_cast<size_t>(this->CustomMaximumFailedTestOutputSize))
Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.61
retrieving revision 1.62
diff -C 2 -d -r1.61 -r1.62
*** cmCTestCoverageHandler.cxx 29 Jan 2009 14:26:40 -0000 1.61
--- cmCTestCoverageHandler.cxx 5 Feb 2009 21:31:37 -0000 1.62
***************
*** 20,23 ****
--- 20,24 ----
#include "cmSystemTools.h"
#include "cmGeneratedFileStream.h"
+ #include "cmXMLSafe.h"
#include <cmsys/Process.h>
***************
*** 471,476 ****
= fileIterator->second;
covLogFile << "\t<File Name=\""
! << this->CTest->MakeXMLSafe(fileName.c_str())
! << "\" FullPath=\"" << this->CTest->MakeXMLSafe(
this->CTest->GetShortPathToFile(
fileIterator->first.c_str())) << "\">" << std::endl
--- 472,477 ----
= fileIterator->second;
covLogFile << "\t<File Name=\""
! << cmXMLSafe(fileName)
! << "\" FullPath=\"" << cmXMLSafe(
this->CTest->GetShortPathToFile(
fileIterator->first.c_str())) << "\">" << std::endl
***************
*** 508,512 ****
covLogFile << "\t\t<Line Number=\"" << cc << "\" Count=\"" << fcov[cc]
<< "\">"
! << this->CTest->MakeXMLSafe(line.c_str()) << "</Line>" << std::endl;
if ( fcov[cc] == 0 )
{
--- 509,513 ----
covLogFile << "\t\t<Line Number=\"" << cc << "\" Count=\"" << fcov[cc]
<< "\">"
! << cmXMLSafe(line) << "</Line>" << std::endl;
if ( fcov[cc] == 0 )
{
***************
*** 537,542 ****
covLogFile << "\t\t</Report>" << std::endl
<< "\t</File>" << std::endl;
! covSumFile << "\t<File Name=\"" << this->CTest->MakeXMLSafe(fileName)
! << "\" FullPath=\"" << this->CTest->MakeXMLSafe(
this->CTest->GetShortPathToFile(fullFileName.c_str()))
<< "\" Covered=\"" << (tested > 0 ? "true":"false") << "\">\n"
--- 538,543 ----
covLogFile << "\t\t</Report>" << std::endl
<< "\t</File>" << std::endl;
! covSumFile << "\t<File Name=\"" << cmXMLSafe(fileName)
! << "\" FullPath=\"" << cmXMLSafe(
this->CTest->GetShortPathToFile(fullFileName.c_str()))
<< "\" Covered=\"" << (tested > 0 ? "true":"false") << "\">\n"
***************
*** 1330,1335 ****
// start the file output
covLogFile << "\t<File Name=\""
! << this->CTest->MakeXMLSafe(i->first.c_str())
! << "\" FullPath=\"" << this->CTest->MakeXMLSafe(
this->CTest->GetShortPathToFile(
i->second.c_str())) << "\">" << std::endl
--- 1331,1336 ----
// start the file output
covLogFile << "\t<File Name=\""
! << cmXMLSafe(i->first)
! << "\" FullPath=\"" << cmXMLSafe(
this->CTest->GetShortPathToFile(
i->second.c_str())) << "\">" << std::endl
***************
*** 1340,1344 ****
{
covLogFile << "\t\t<Line Number=\"" << line << "\" Count=\"-1\">"
! << this->CTest->MakeXMLSafe(bullseyeHelp[k])
<< "</Line>" << std::endl;
line++;
--- 1341,1345 ----
{
covLogFile << "\t\t<Line Number=\"" << line << "\" Count=\"-1\">"
! << cmXMLSafe(bullseyeHelp[k])
<< "</Line>" << std::endl;
line++;
***************
*** 1356,1360 ****
{
covLogFile << "\t\t<Line Number=\"" << line << "\" Count=\"-1\">"
! << this->CTest->MakeXMLSafe(lineIn.c_str())
<< "</Line>" << std::endl;
line++;
--- 1357,1361 ----
{
covLogFile << "\t\t<Line Number=\"" << line << "\" Count=\"-1\">"
! << cmXMLSafe(lineIn)
<< "</Line>" << std::endl;
line++;
***************
*** 1562,1567 ****
tmpLog << "percentCoverage: " << percent_coverage << "\n";
tmpLog << "coverage metric: " << cmet << "\n";
! covSumFile << "\t<File Name=\"" << this->CTest->MakeXMLSafe(sourceFile)
! << "\" FullPath=\"" << this->CTest->MakeXMLSafe(
this->CTest->GetShortPathToFile(file.c_str()))
<< "\" Covered=\"" << (cmet>0?"true":"false") << "\">\n"
--- 1563,1568 ----
tmpLog << "percentCoverage: " << percent_coverage << "\n";
tmpLog << "coverage metric: " << cmet << "\n";
! covSumFile << "\t<File Name=\"" << cmXMLSafe(sourceFile)
! << "\" FullPath=\"" << cmXMLSafe(
this->CTest->GetShortPathToFile(file.c_str()))
<< "\" Covered=\"" << (cmet>0?"true":"false") << "\">\n"
Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -C 2 -d -r1.50 -r1.51
*** cmCTestUpdateHandler.cxx 12 Jan 2009 15:37:55 -0000 1.50
--- cmCTestUpdateHandler.cxx 5 Feb 2009 21:31:37 -0000 1.51
***************
*** 26,29 ****
--- 26,30 ----
#include "cmGeneratedFileStream.h"
#include "cmXMLParser.h"
+ #include "cmXMLSafe.h"
//#include <cmsys/RegularExpression.hxx>
***************
*** 654,660 ****
os << "\t<StartDateTime>" << start_time << "</StartDateTime>\n"
<< "\t<StartTime>" << start_time_time << "</StartTime>\n"
! << "\t<UpdateCommand>" << this->CTest->MakeXMLSafe(command)
<< "</UpdateCommand>\n"
! << "\t<UpdateType>" << this->CTest->MakeXMLSafe(
cmCTestUpdateHandlerUpdateToString(updateType))
<< "</UpdateType>\n";
--- 655,661 ----
os << "\t<StartDateTime>" << start_time << "</StartDateTime>\n"
<< "\t<StartTime>" << start_time_time << "</StartTime>\n"
! << "\t<UpdateCommand>" << cmXMLSafe(command)
<< "</UpdateCommand>\n"
! << "\t<UpdateType>" << cmXMLSafe(
cmCTestUpdateHandlerUpdateToString(updateType))
<< "</UpdateType>\n";
***************
*** 1010,1024 ****
<< sauthor1.c_str() << " to revision: " << srevision1.c_str()
<< " from revision: " << srevision2.c_str() << std::endl);
! os << "\t\t<File Directory=\"" << cmCTest::MakeXMLSafe(path) << "\">"
! << cmCTest::MakeXMLSafe(fname)
<< "</File>\n"
! << "\t\t<Directory>" << cmCTest::MakeXMLSafe(path)
<< "</Directory>\n"
! << "\t\t<FullName>" << cmCTest::MakeXMLSafe(file) << "</FullName>\n"
! << "\t\t<CheckinDate>" << cmCTest::MakeXMLSafe(sdate1)
<< "</CheckinDate>\n"
! << "\t\t<Author>" << cmCTest::MakeXMLSafe(sauthor1) << "</Author>\n"
! << "\t\t<Email>" << cmCTest::MakeXMLSafe(semail1) << "</Email>\n"
! << "\t\t<Log>" << cmCTest::MakeXMLSafe(comment1) << "</Log>\n"
<< "\t\t<Revision>" << srevision1 << "</Revision>\n"
<< "\t\t<PriorRevision>" << srevision2 << "</PriorRevision>"
--- 1011,1025 ----
<< sauthor1.c_str() << " to revision: " << srevision1.c_str()
<< " from revision: " << srevision2.c_str() << std::endl);
! os << "\t\t<File Directory=\"" << cmXMLSafe(path) << "\">"
! << cmXMLSafe(fname)
<< "</File>\n"
! << "\t\t<Directory>" << cmXMLSafe(path)
<< "</Directory>\n"
! << "\t\t<FullName>" << cmXMLSafe(file) << "</FullName>\n"
! << "\t\t<CheckinDate>" << cmXMLSafe(sdate1)
<< "</CheckinDate>\n"
! << "\t\t<Author>" << cmXMLSafe(sauthor1) << "</Author>\n"
! << "\t\t<Email>" << cmXMLSafe(semail1) << "</Email>\n"
! << "\t\t<Log>" << cmXMLSafe(comment1) << "</Log>\n"
<< "\t\t<Revision>" << srevision1 << "</Revision>\n"
<< "\t\t<PriorRevision>" << srevision2 << "</PriorRevision>"
***************
*** 1031,1041 ****
<< "\t\t\t<PreviousRevision>" << srevision2
<< "</PreviousRevision>\n"
! << "\t\t\t<Author>" << cmCTest::MakeXMLSafe(sauthor1)
<< "</Author>\n"
! << "\t\t\t<Date>" << cmCTest::MakeXMLSafe(sdate1)
<< "</Date>\n"
! << "\t\t\t<Comment>" << cmCTest::MakeXMLSafe(comment1)
<< "</Comment>\n"
! << "\t\t\t<Email>" << cmCTest::MakeXMLSafe(semail1)
<< "</Email>\n"
<< "\t\t</Revisions>\n"
--- 1032,1042 ----
<< "\t\t\t<PreviousRevision>" << srevision2
<< "</PreviousRevision>\n"
! << "\t\t\t<Author>" << cmXMLSafe(sauthor1)
<< "</Author>\n"
! << "\t\t\t<Date>" << cmXMLSafe(sdate1)
<< "</Date>\n"
! << "\t\t\t<Comment>" << cmXMLSafe(comment1)
<< "</Comment>\n"
! << "\t\t\t<Email>" << cmXMLSafe(semail1)
<< "</Email>\n"
<< "\t\t</Revisions>\n"
***************
*** 1044,1054 ****
<< "\t\t\t<PreviousRevision>" << srevision2
<< "</PreviousRevision>\n"
! << "\t\t\t<Author>" << cmCTest::MakeXMLSafe(sauthor2)
<< "</Author>\n"
! << "\t\t\t<Date>" << cmCTest::MakeXMLSafe(sdate2)
<< "</Date>\n"
! << "\t\t\t<Comment>" << cmCTest::MakeXMLSafe(comment2)
<< "</Comment>\n"
! << "\t\t\t<Email>" << cmCTest::MakeXMLSafe(semail2)
<< "</Email>\n"
<< "\t\t</Revisions>" << std::endl;
--- 1045,1055 ----
<< "\t\t\t<PreviousRevision>" << srevision2
<< "</PreviousRevision>\n"
! << "\t\t\t<Author>" << cmXMLSafe(sauthor2)
<< "</Author>\n"
! << "\t\t\t<Date>" << cmXMLSafe(sdate2)
<< "</Date>\n"
! << "\t\t\t<Comment>" << cmXMLSafe(comment2)
<< "</Comment>\n"
! << "\t\t\t<Email>" << cmXMLSafe(semail2)
<< "</Email>\n"
<< "\t\t</Revisions>" << std::endl;
***************
*** 1148,1152 ****
{
os << "Update error: ";
! os << this->CTest->MakeXMLSafe(checkoutErrorMessages);
cmCTestLog(this->CTest, ERROR_MESSAGE, " Update with command: "
<< command << " failed" << std::endl);
--- 1149,1153 ----
{
os << "Update error: ";
! os << cmXMLSafe(checkoutErrorMessages);
cmCTestLog(this->CTest, ERROR_MESSAGE, " Update with command: "
<< command << " failed" << std::endl);
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.90
retrieving revision 1.91
diff -C 2 -d -r1.90 -r1.91
*** cmCTestTestHandler.cxx 2 Feb 2009 18:24:26 -0000 1.90
--- cmCTestTestHandler.cxx 5 Feb 2009 21:31:37 -0000 1.91
***************
*** 29,32 ****
--- 29,33 ----
#include "cmCommand.h"
#include "cmSystemTools.h"
+ #include "cmXMLSafe.h"
#include <stdlib.h>
***************
*** 1465,1469 ****
cmCTestTestResult *result = &this->TestResults[cc];
std::string testPath = result->Path + "/" + result->Name;
! os << "\t\t<Test>" << cmCTest::MakeXMLSafe(
this->CTest->GetShortPathToFile(testPath.c_str()))
<< "</Test>" << std::endl;
--- 1466,1470 ----
cmCTestTestResult *result = &this->TestResults[cc];
std::string testPath = result->Path + "/" + result->Name;
! os << "\t\t<Test>" << cmXMLSafe(
this->CTest->GetShortPathToFile(testPath.c_str()))
<< "</Test>" << std::endl;
***************
*** 1482,1486 ****
os << "\t\t\t<NamedMeasurement type=\"text/string\" "
"name=\"Exit Code\"><Value>"
! << cmCTest::MakeXMLSafe(this->GetTestStatus(result->Status))
<< "</Value>"
"</NamedMeasurement>\n"
--- 1483,1487 ----
os << "\t\t\t<NamedMeasurement type=\"text/string\" "
"name=\"Exit Code\"><Value>"
! << cmXMLSafe(this->GetTestStatus(result->Status))
<< "</Value>"
"</NamedMeasurement>\n"
***************
*** 1499,1503 ****
<< "\t\t\t<NamedMeasurement type=\"text/string\" "
<< "name=\"Completion Status\"><Value>"
! << cmCTest::MakeXMLSafe(result->CompletionStatus)
<< "</Value></NamedMeasurement>\n";
}
--- 1500,1504 ----
<< "\t\t\t<NamedMeasurement type=\"text/string\" "
<< "name=\"Completion Status\"><Value>"
! << cmXMLSafe(result->CompletionStatus)
<< "</Value></NamedMeasurement>\n";
}
***************
*** 1505,1509 ****
<< "\t\t\t<NamedMeasurement type=\"text/string\" "
<< "name=\"Command Line\"><Value>"
! << cmCTest::MakeXMLSafe(result->FullCommandLine)
<< "</Value></NamedMeasurement>\n";
std::map<cmStdString,cmStdString>::iterator measureIt;
--- 1506,1510 ----
<< "\t\t\t<NamedMeasurement type=\"text/string\" "
<< "name=\"Command Line\"><Value>"
! << cmXMLSafe(result->FullCommandLine)
<< "</Value></NamedMeasurement>\n";
std::map<cmStdString,cmStdString>::iterator measureIt;
***************
*** 1515,1519 ****
<< "\t\t\t<NamedMeasurement type=\"text/string\" "
<< "name=\"" << measureIt->first.c_str() << "\"><Value>"
! << cmCTest::MakeXMLSafe(measureIt->second.c_str())
<< "</Value></NamedMeasurement>\n";
}
--- 1516,1520 ----
<< "\t\t\t<NamedMeasurement type=\"text/string\" "
<< "name=\"" << measureIt->first.c_str() << "\"><Value>"
! << cmXMLSafe(measureIt->second)
<< "</Value></NamedMeasurement>\n";
}
***************
*** 1521,1525 ****
<< "\t\t\t<Measurement>\n"
<< "\t\t\t\t<Value>";
! os << cmCTest::MakeXMLSafe(result->Output);
os
<< "</Value>\n"
--- 1522,1526 ----
<< "\t\t\t<Measurement>\n"
<< "\t\t\t\t<Value>";
! os << cmXMLSafe(result->Output);
os
<< "</Value>\n"
***************
*** 1557,1567 ****
std::string testPath = result->Path + "/" + result->Name;
os << "\">\n"
! << "\t\t<Name>" << cmCTest::MakeXMLSafe(result->Name) << "</Name>\n"
! << "\t\t<Path>" << cmCTest::MakeXMLSafe(
this->CTest->GetShortPathToFile(result->Path.c_str())) << "</Path>\n"
! << "\t\t<FullName>" << cmCTest::MakeXMLSafe(
this->CTest->GetShortPathToFile(testPath.c_str())) << "</FullName>\n"
<< "\t\t<FullCommandLine>"
! << cmCTest::MakeXMLSafe(result->FullCommandLine)
<< "</FullCommandLine>\n";
}
--- 1558,1568 ----
std::string testPath = result->Path + "/" + result->Name;
os << "\">\n"
! << "\t\t<Name>" << cmXMLSafe(result->Name) << "</Name>\n"
! << "\t\t<Path>" << cmXMLSafe(
this->CTest->GetShortPathToFile(result->Path.c_str())) << "</Path>\n"
! << "\t\t<FullName>" << cmXMLSafe(
this->CTest->GetShortPathToFile(testPath.c_str())) << "</FullName>\n"
<< "\t\t<FullCommandLine>"
! << cmXMLSafe(result->FullCommandLine)
<< "</FullCommandLine>\n";
}
***************
*** 1578,1582 ****
li != labels.end(); ++li)
{
! os << "\t\t\t<Label>" << cmCTest::MakeXMLSafe(*li) << "</Label>\n";
}
os << "\t\t</Labels>\n";
--- 1579,1583 ----
li != labels.end(); ++li)
{
! os << "\t\t\t<Label>" << cmXMLSafe(*li) << "</Label>\n";
}
os << "\t\t</Labels>\n";
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.69
retrieving revision 1.70
diff -C 2 -d -r1.69 -r1.70
*** cmCTestBuildHandler.cxx 4 Feb 2009 19:34:25 -0000 1.69
--- cmCTestBuildHandler.cxx 5 Feb 2009 21:31:37 -0000 1.70
***************
*** 24,27 ****
--- 24,28 ----
#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
+ #include "cmXMLSafe.h"
//#include <cmsys/RegularExpression.hxx>
***************
*** 491,495 ****
<< "</StartBuildTime>\n"
<< "<BuildCommand>"
! << this->CTest->MakeXMLSafe(
this->CTest->GetCTestConfiguration("MakeCommand"))
<< "</BuildCommand>" << std::endl;
--- 492,496 ----
<< "</StartBuildTime>\n"
<< "<BuildCommand>"
! << cmXMLSafe(
this->CTest->GetCTestConfiguration("MakeCommand"))
<< "</BuildCommand>" << std::endl;
***************
*** 527,531 ****
os << "\t<" << (cm->Error ? "Error" : "Warning") << ">\n"
<< "\t\t<BuildLogLine>" << cm->LogLine << "</BuildLogLine>\n"
! << "\t\t<Text>" << this->CTest->MakeXMLSafe(cm->Text)
<< "\n</Text>" << std::endl;
std::vector<cmCTestCompileErrorWarningRex>::iterator rit;
--- 528,532 ----
os << "\t<" << (cm->Error ? "Error" : "Warning") << ">\n"
<< "\t\t<BuildLogLine>" << cm->LogLine << "</BuildLogLine>\n"
! << "\t\t<Text>" << cmXMLSafe(cm->Text).Quotes(false)
<< "\n</Text>" << std::endl;
std::vector<cmCTestCompileErrorWarningRex>::iterator rit;
***************
*** 580,586 ****
}
}
! os << "\t\t<PreContext>" << this->CTest->MakeXMLSafe(cm->PreContext)
<< "</PreContext>\n"
! << "\t\t<PostContext>" << this->CTest->MakeXMLSafe(cm->PostContext);
// is this the last warning or error, if so notify
if (cm->Error && !numErrorsAllowed ||
--- 581,587 ----
}
}
! os << "\t\t<PreContext>" << cmXMLSafe(cm->PreContext).Quotes(false)
<< "</PreContext>\n"
! << "\t\t<PostContext>" << cmXMLSafe(cm->PostContext).Quotes(false);
// is this the last warning or error, if so notify
if (cm->Error && !numErrorsAllowed ||
More information about the Cmake-commits
mailing list