[Cmake-commits] CMake branch, next, updated. v3.3.1-2593-gb19023d
Brad King
brad.king at kitware.com
Fri Aug 28 10:17:46 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b19023dd1d340cb6677beeec37e67746417e7569 (commit)
via ab2524d63f651e6d96c770fb3571bddab4b86621 (commit)
via dee84dc73d88d05b9ad66908780c3e7c6ddc67ef (commit)
via b3372db588431f000b5fe3de980d6a2f27382eb1 (commit)
from ac74eff5bb5cb1827cb4636a0bdf9a9baab248ce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b19023dd1d340cb6677beeec37e67746417e7569
commit b19023dd1d340cb6677beeec37e67746417e7569
Merge: ac74eff ab2524d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 28 10:17:44 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 28 10:17:44 2015 -0400
Merge topic 'fix-ctest-xml-double-encoding' into next
ab2524d6 CTest: Fix XML double-encoding cases
dee84dc7 cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes
b3372db5 cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includes
diff --cc Source/CTest/cmCTestGIT.cxx
index 5b9208a,c32e876..bbb3b9d
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@@ -14,9 -14,9 +14,8 @@@
#include "cmCTest.h"
#include "cmSystemTools.h"
#include "cmAlgorithms.h"
- #include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
-#include <cmsys/ios/sstream>
#include <cmsys/Process.h>
#include <cmsys/FStream.hxx>
diff --cc Source/CTest/cmCTestP4.cxx
index 5ce431a,ad8e8b3..5e0c54a
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@@ -13,9 -13,9 +13,8 @@@
#include "cmCTest.h"
#include "cmSystemTools.h"
- #include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
-#include <cmsys/ios/sstream>
#include <cmsys/Process.h>
#include <sys/types.h>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab2524d63f651e6d96c770fb3571bddab4b86621
commit ab2524d63f651e6d96c770fb3571bddab4b86621
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jul 16 21:48:00 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 28 10:11:09 2015 -0400
CTest: Fix XML double-encoding cases
Remove use of cmXMLSafe from CTest when generating content that is later
handled by cmXMLWriter. This was broken by refactoring in the topic
merged by commit v3.3.0-rc1~22 (Merge topic 'ctest-xml-refactor',
2015-05-28).
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 8f26716..acf527a 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -80,8 +80,8 @@ public:
int i = 0;
for(; atts[i] != 0; i+=2)
{
- ostr << " " << cmXMLSafe(atts[i])
- << " - " << cmXMLSafe(atts[i+1]) << "\n";
+ ostr << " " << atts[i]
+ << " - " << atts[i+1] << "\n";
}
ostr << "\n";
this->Log += ostr.str();
@@ -856,7 +856,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckSanitizerOutput(
defects++;
ostr << "<b>" << this->ResultStrings[idx] << "</b> ";
}
- ostr << cmXMLSafe(*i) << std::endl;
+ ostr << *i << std::endl;
}
log = ostr.str();
if(defects)
@@ -908,7 +908,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
results[failure] ++;
defects ++;
}
- ostr << cmXMLSafe(*i) << std::endl;
+ ostr << *i << std::endl;
}
log = ostr.str();
@@ -1056,7 +1056,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
defects ++;
}
totalOutputSize += lines[cc].size();
- ostr << cmXMLSafe(lines[cc]) << std::endl;
+ ostr << lines[cc] << std::endl;
}
else
{
@@ -1070,11 +1070,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
nonValGrindOutput.begin(); i != nonValGrindOutput.end(); ++i)
{
totalOutputSize += lines[*i].size();
- cmCTestOptionalLog(this->CTest, DEBUG, "before xml safe "
- << lines[*i] << std::endl, this->Quiet);
- cmCTestOptionalLog(this->CTest, DEBUG, "after xml safe "
- << cmXMLSafe(lines[*i]) << std::endl, this->Quiet);
- ostr << cmXMLSafe(lines[*i]) << std::endl;
+ ostr << lines[*i] << std::endl;
if(!unlimitedOutput && totalOutputSize >
static_cast<size_t>(this->CustomMaximumFailedTestOutputSize))
{
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 2af09cb..f93b87b 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -2070,7 +2070,7 @@ bool cmCTestTestHandler::CleanTestOutput(std::string& output, size_t length)
}
current = next;
}
- else // Bad byte will be handled by cmXMLSafe.
+ else // Bad byte will be handled by cmXMLWriter.
{
++current;
}
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index e3b7a2b..8fa19d2 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -22,7 +22,6 @@
#include <cmsys/FStream.hxx>
#include "cmDynamicLoader.h"
#include "cmGeneratedFileStream.h"
-#include "cmXMLSafe.h"
#include "cmVersionMacros.h"
#include "cmCTestCommand.h"
#include "cmCTestStartCommand.h"
@@ -156,7 +155,7 @@ std::string cmCTest::CurrentTime()
strftime(current_time, 1000, "%a %b %d %H:%M:%S %Z %Y", t);
}
cmCTestLog(this, DEBUG, " Current_Time: " << current_time << std::endl);
- return cmXMLSafe(cmCTest::CleanString(current_time)).str();
+ return cmCTest::CleanString(current_time);
}
//----------------------------------------------------------------------
@@ -1477,8 +1476,6 @@ std::string cmCTest::SafeBuildIdField(const std::string& value)
cmSystemTools::ReplaceString(safevalue, replace, "");
}
}
-
- safevalue = cmXMLSafe(safevalue).str();
}
if (safevalue == "")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dee84dc73d88d05b9ad66908780c3e7c6ddc67ef
commit dee84dc73d88d05b9ad66908780c3e7c6ddc67ef
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jul 16 21:47:29 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 28 10:11:08 2015 -0400
cmCTest{BZR,GIT,P4}: Remove unused cmXMLSafe includes
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx
index 3014a93..587b583 100644
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@@ -14,7 +14,6 @@
#include "cmCTest.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
-#include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 6b84bab..c32e876 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -14,7 +14,6 @@
#include "cmCTest.h"
#include "cmSystemTools.h"
#include "cmAlgorithms.h"
-#include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
#include <cmsys/ios/sstream>
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 31002a6..ad8e8b3 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -13,7 +13,6 @@
#include "cmCTest.h"
#include "cmSystemTools.h"
-#include "cmXMLSafe.h"
#include <cmsys/RegularExpression.hxx>
#include <cmsys/ios/sstream>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3372db588431f000b5fe3de980d6a2f27382eb1
commit b3372db588431f000b5fe3de980d6a2f27382eb1
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Jul 16 21:47:29 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 28 10:11:08 2015 -0400
cmExtra{Kate,SublimeText}Generator: Remove unused cmXMLSafe includes
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 578e7d3..f83b5cf 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -19,7 +19,6 @@
#include "cmGeneratedFileStream.h"
#include "cmTarget.h"
#include "cmSystemTools.h"
-#include "cmXMLSafe.h"
#include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 4e721d4..163a75b 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -21,7 +21,6 @@
#include "cmSourceFile.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
-#include "cmXMLSafe.h"
#include <cmsys/SystemTools.hxx>
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestBZR.cxx | 1 -
Source/CTest/cmCTestGIT.cxx | 1 -
Source/CTest/cmCTestMemCheckHandler.cxx | 16 ++++++----------
Source/CTest/cmCTestP4.cxx | 1 -
Source/CTest/cmCTestTestHandler.cxx | 2 +-
Source/cmCTest.cxx | 5 +----
Source/cmExtraKateGenerator.cxx | 1 -
Source/cmExtraSublimeTextGenerator.cxx | 1 -
8 files changed, 8 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list