From 0a23c0ee40939b50a41a2d80e98f6f307d84d26f Mon Sep 17 00:00:00 2001
From: David Cole <david.cole@kitware.com>
Date: Thu, 22 Jan 2009 07:16:05 -0500
Subject: BUG: Fix issue #8363. Wrap output with MakeXMLSafe calls so that the
 generated XML files are valid, parse-able XML.

---
 Source/CTest/cmCTestTestHandler.cxx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index dfe46ef..c04fd9a 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1503,26 +1503,31 @@ void cmCTestTestHandler::GenerateDartOutput(std::ostream& os)
         {
         os << "\t\t\t<NamedMeasurement type=\"text/string\" "
           "name=\"Exit Code\"><Value>"
-          << this->GetTestStatus(result->Status) << "</Value>"
+          << cmCTest::MakeXMLSafe(this->GetTestStatus(result->Status))
+          << "</Value>"
           "</NamedMeasurement>\n"
           << "\t\t\t<NamedMeasurement type=\"text/string\" "
           "name=\"Exit Value\"><Value>"
-          << result->ReturnValue << "</Value></NamedMeasurement>"
+          << result->ReturnValue
+          << "</Value></NamedMeasurement>"
           << std::endl;
         }
       os << result->RegressionImages;
       os << "\t\t\t<NamedMeasurement type=\"numeric/double\" "
         << "name=\"Execution Time\"><Value>"
-        << result->ExecutionTime << "</Value></NamedMeasurement>\n";
+        << result->ExecutionTime
+        << "</Value></NamedMeasurement>\n";
       os
         << "\t\t\t<NamedMeasurement type=\"text/string\" "
         << "name=\"Completion Status\"><Value>"
-        << result->CompletionStatus << "</Value></NamedMeasurement>\n";
+        << cmCTest::MakeXMLSafe(result->CompletionStatus)
+        << "</Value></NamedMeasurement>\n";
       }
     os
       << "\t\t\t<NamedMeasurement type=\"text/string\" "
       << "name=\"Command Line\"><Value>"
-      << result->FullCommandLine << "</Value></NamedMeasurement>\n";
+      << cmCTest::MakeXMLSafe(result->FullCommandLine)
+      << "</Value></NamedMeasurement>\n";
     std::map<cmStdString,cmStdString>::iterator measureIt;
     for ( measureIt = result->Properties->Measurements.begin();
       measureIt != result->Properties->Measurements.end();
@@ -1531,7 +1536,8 @@ void cmCTestTestHandler::GenerateDartOutput(std::ostream& os)
       os
         << "\t\t\t<NamedMeasurement type=\"text/string\" "
         << "name=\"" << measureIt->first.c_str() << "\"><Value>"
-        << measureIt->second.c_str() << "</Value></NamedMeasurement>\n";
+        << cmCTest::MakeXMLSafe(measureIt->second.c_str())
+        << "</Value></NamedMeasurement>\n";
       }
     os
       << "\t\t\t<Measurement>\n"
-- 
cgit v0.12