diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2015-07-16 19:48:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-28 14:11:09 (GMT) |
| commit | ab2524d63f651e6d96c770fb3571bddab4b86621 (patch) | |
| tree | 33d5acacdcd98f8478ba74bf123764d376ec221b /Source/cmCTest.cxx | |
| parent | dee84dc73d88d05b9ad66908780c3e7c6ddc67ef (diff) | |
| download | CMake-ab2524d63f651e6d96c770fb3571bddab4b86621.zip CMake-ab2524d63f651e6d96c770fb3571bddab4b86621.tar.gz CMake-ab2524d63f651e6d96c770fb3571bddab4b86621.tar.bz2 | |
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).
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
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 == "") |