From 4c725d1e0ef60f55d7c6b628d9fcd4961f4f2115 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 18 Dec 2008 12:27:59 -0500 Subject: [PATCH] ENH: Minor readability improvement in CTest output When ctest --build-and-test runs the --test-command its output did not quote the arguments of the command being tested making it difficult to read. This adds the quotes. This also changes the wording of the failure case to not sound like CTest could not run the executable when in fact it ran and returned failure. --- Source/CTest/cmCTestBuildAndTestHandler.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 92d82709c..a35aacf71 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -359,10 +359,10 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) out << "Run test in directory: " << this->BuildRunDir << "\n"; cmSystemTools::ChangeDirectory(this->BuildRunDir.c_str()); } - out << "Running test executable: " << fullPath << " "; + out << "Running test command: \"" << fullPath << "\""; for(k=0; k < this->TestCommandArgs.size(); ++k) { - out << this->TestCommandArgs[k] << " "; + out << " \"" << this->TestCommandArgs[k] << "\""; } out << "\n"; @@ -386,7 +386,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) if(runTestRes != cmsysProcess_State_Exited || retval != 0) { - out << "Failed to run test command: " << testCommand[0] << "\n"; + out << "Test command failed: " << testCommand[0] << "\n"; retval = 1; }