diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-10-18 02:47:15 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-10-18 02:47:15 (GMT) |
| commit | b40cd9fc3bf75f88c98130ab3365c4d69f67baaf (patch) | |
| tree | fa520ec2a730569cd22710b7580f4ce763b78699 /Source | |
| parent | ddb3dfdf2f06369eccfa7261afd2d66f3446c220 (diff) | |
| download | CMake-b40cd9fc3bf75f88c98130ab3365c4d69f67baaf.zip CMake-b40cd9fc3bf75f88c98130ab3365c4d69f67baaf.tar.gz CMake-b40cd9fc3bf75f88c98130ab3365c4d69f67baaf.tar.bz2 | |
ENH: Cleanups and unify output
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index a19e180..59e1a6d 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -613,13 +613,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed, } cres.m_Output = output; cres.m_ReturnValue = retVal; - std::string nwd = it->m_Directory; - if ( nwd.size() > m_CTest->GetToplevelPath().size() ) - { - nwd = "." + nwd.substr(m_CTest->GetToplevelPath().size(), nwd.npos); - } - cmSystemTools::ReplaceString(nwd, "\\", "/"); - cres.m_Path = nwd; + cres.m_Path = it->m_Directory.c_str(); cres.m_CompletionStatus = "Completed"; m_TestResults.push_back( cres ); } @@ -664,8 +658,9 @@ void cmCTestTestHandler::GenerateDartMemCheckOutput(std::ostream& os) for ( cc = 0; cc < m_TestResults.size(); cc ++ ) { cmCTestTestResult *result = &m_TestResults[cc]; - os << "\t\t<Test>" << cmCTest::MakeXMLSafe(result->m_Path) - << "/" << cmCTest::MakeXMLSafe(result->m_Name) + std::string testPath = result->m_Path + "/" + result->m_Name; + os << "\t\t<Test>" << cmCTest::MakeXMLSafe( + m_CTest->GetShortPathToFile(testPath.c_str())) << "</Test>" << std::endl; } os << "\t</TestList>\n"; @@ -697,11 +692,13 @@ void cmCTestTestHandler::GenerateDartMemCheckOutput(std::ostream& os) { os << "failed"; } + std::string testPath = result->m_Path + "/" + result->m_Name; os << "\">\n" << "\t\t<Name>" << cmCTest::MakeXMLSafe(result->m_Name) << "</Name>\n" - << "\t\t<Path>" << cmCTest::MakeXMLSafe(result->m_Path) << "</Path>\n" - << "\t\t<FullName>" << cmCTest::MakeXMLSafe(result->m_Path) - << "/" << cmCTest::MakeXMLSafe(result->m_Name) << "</FullName>\n" + << "\t\t<Path>" << cmCTest::MakeXMLSafe( + m_CTest->GetShortPathToFile(result->m_Path.c_str())) << "</Path>\n" + << "\t\t<FullName>" << cmCTest::MakeXMLSafe( + m_CTest->GetShortPathToFile(testPath.c_str())) << "</FullName>\n" << "\t\t<FullCommandLine>" << cmCTest::MakeXMLSafe(result->m_FullCommandLine) << "</FullCommandLine>\n" @@ -769,8 +766,9 @@ void cmCTestTestHandler::GenerateDartTestOutput(std::ostream& os) for ( cc = 0; cc < m_TestResults.size(); cc ++ ) { cmCTestTestResult *result = &m_TestResults[cc]; - os << "\t\t<Test>" << cmCTest::MakeXMLSafe(result->m_Path) - << "/" << cmCTest::MakeXMLSafe(result->m_Name) + std::string testPath = result->m_Path + "/" + result->m_Name; + os << "\t\t<Test>" << cmCTest::MakeXMLSafe( + m_CTest->GetShortPathToFile(testPath.c_str())) << "</Test>" << std::endl; } os << "\t</TestList>\n"; @@ -790,11 +788,13 @@ void cmCTestTestHandler::GenerateDartTestOutput(std::ostream& os) { os << "failed"; } + std::string testPath = result->m_Path + "/" + result->m_Name; os << "\">\n" << "\t\t<Name>" << cmCTest::MakeXMLSafe(result->m_Name) << "</Name>\n" - << "\t\t<Path>" << cmCTest::MakeXMLSafe(result->m_Path) << "</Path>\n" - << "\t\t<FullName>" << cmCTest::MakeXMLSafe(result->m_Path) - << "/" << cmCTest::MakeXMLSafe(result->m_Name) << "</FullName>\n" + << "\t\t<Path>" << cmCTest::MakeXMLSafe( + m_CTest->GetShortPathToFile(result->m_Path.c_str())) << "</Path>\n" + << "\t\t<FullName>" << cmCTest::MakeXMLSafe( + m_CTest->GetShortPathToFile(testPath.c_str())) << "</FullName>\n" << "\t\t<FullCommandLine>" << cmCTest::MakeXMLSafe(result->m_FullCommandLine) << "</FullCommandLine>\n" |