[Cmake-commits] [cmake-commits] david.cole committed cmCTestTestHandler.cxx 1.88 1.89

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv9386

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
BUG: Fix issue #8363. Wrap output with MakeXMLSafe calls so that the generated XML files are valid, parse-able XML.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.88
retrieving revision 1.89
diff -C 2 -d -r1.88 -r1.89
*** cmCTestTestHandler.cxx	15 Jan 2009 15:32:56 -0000	1.88
--- cmCTestTestHandler.cxx	22 Jan 2009 12:16:05 -0000	1.89
***************
*** 1504,1512 ****
          os << "\t\t\t<NamedMeasurement type=\"text/string\" "
            "name=\"Exit Code\"><Value>"
!           << this->GetTestStatus(result->Status) << "</Value>"
            "</NamedMeasurement>\n"
            << "\t\t\t<NamedMeasurement type=\"text/string\" "
            "name=\"Exit Value\"><Value>"
!           << result->ReturnValue << "</Value></NamedMeasurement>"
            << std::endl;
          }
--- 1504,1514 ----
          os << "\t\t\t<NamedMeasurement type=\"text/string\" "
            "name=\"Exit Code\"><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>"
            << std::endl;
          }
***************
*** 1514,1527 ****
        os << "\t\t\t<NamedMeasurement type=\"numeric/double\" "
          << "name=\"Execution Time\"><Value>"
!         << result->ExecutionTime << "</Value></NamedMeasurement>\n";
        os
          << "\t\t\t<NamedMeasurement type=\"text/string\" "
          << "name=\"Completion Status\"><Value>"
!         << result->CompletionStatus << "</Value></NamedMeasurement>\n";
        }
      os
        << "\t\t\t<NamedMeasurement type=\"text/string\" "
        << "name=\"Command Line\"><Value>"
!       << result->FullCommandLine << "</Value></NamedMeasurement>\n";
      std::map<cmStdString,cmStdString>::iterator measureIt;
      for ( measureIt = result->Properties->Measurements.begin();
--- 1516,1532 ----
        os << "\t\t\t<NamedMeasurement type=\"numeric/double\" "
          << "name=\"Execution Time\"><Value>"
!         << result->ExecutionTime
!         << "</Value></NamedMeasurement>\n";
        os
          << "\t\t\t<NamedMeasurement type=\"text/string\" "
          << "name=\"Completion Status\"><Value>"
!         << cmCTest::MakeXMLSafe(result->CompletionStatus)
!         << "</Value></NamedMeasurement>\n";
        }
      os
        << "\t\t\t<NamedMeasurement type=\"text/string\" "
        << "name=\"Command Line\"><Value>"
!       << cmCTest::MakeXMLSafe(result->FullCommandLine)
!       << "</Value></NamedMeasurement>\n";
      std::map<cmStdString,cmStdString>::iterator measureIt;
      for ( measureIt = result->Properties->Measurements.begin();
***************
*** 1532,1536 ****
          << "\t\t\t<NamedMeasurement type=\"text/string\" "
          << "name=\"" << measureIt->first.c_str() << "\"><Value>"
!         << measureIt->second.c_str() << "</Value></NamedMeasurement>\n";
        }
      os
--- 1537,1542 ----
          << "\t\t\t<NamedMeasurement type=\"text/string\" "
          << "name=\"" << measureIt->first.c_str() << "\"><Value>"
!         << cmCTest::MakeXMLSafe(measureIt->second.c_str())
!         << "</Value></NamedMeasurement>\n";
        }
      os