diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-07-11 19:58:07 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-07-11 19:58:07 (GMT) |
| commit | 12cc89a8e5261ab08177f4f205b932ee50c26a18 (patch) | |
| tree | fa2e38da36839a018794b229bf49c7b97fedba45 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | 87ef95c71549a7aada8be6ed5d7f45f0aefc85ce (diff) | |
| download | CMake-12cc89a8e5261ab08177f4f205b932ee50c26a18.zip CMake-12cc89a8e5261ab08177f4f205b932ee50c26a18.tar.gz CMake-12cc89a8e5261ab08177f4f205b932ee50c26a18.tar.bz2 | |
BUG: Try to fix the problem of bad test names
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1b4968d..7497f44 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -72,6 +72,7 @@ public: //---------------------------------------------------------------------- bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args) { +#undef cout if(args.size() < 1 ) { this->SetError("called with incorrect number of arguments"); @@ -79,9 +80,11 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args) } std::vector<std::string>::const_iterator it; std::string cwd = cmSystemTools::GetCurrentWorkingDirectory(); + std::cout << __LINE__ << " Current directory: " << cwd.c_str() << std::endl; for ( it = args.begin(); it != args.end(); ++ it ) { cmSystemTools::ChangeDirectory(cwd.c_str()); + std::cout << __LINE__ << " Current directory: " << cwd.c_str() << std::endl; std::string fname = cwd; fname += "/"; fname += *it; @@ -92,6 +95,7 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args) continue; } cmSystemTools::ChangeDirectory(fname.c_str()); + std::cout << __LINE__ << " Current directory: " << fname.c_str() << std::endl; const char* testFilename; if( cmSystemTools::FileExists("CTestTestfile.cmake") ) { @@ -1655,6 +1659,7 @@ bool cmCTestTestHandler::SetTestsProperties( bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args) { const std::string& testname = args[0]; + cmCTestLog(this->CTest, ERROR_MESSAGE, "Add test: " << args[0] << std::endl); if (this->UseExcludeRegExpFlag && this->UseExcludeRegExpFirst && this->ExcludeTestsRegularExpression.find(testname.c_str())) @@ -1706,6 +1711,8 @@ bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args) test.Name = testname; test.Args = args; test.Directory = cmSystemTools::GetCurrentWorkingDirectory(); + cmCTestLog(this->CTest, ERROR_MESSAGE, "Set test directory: " << test.Directory << std::endl); + test.IsInBasedOnREOptions = true; test.WillFail = false; if (this->UseIncludeRegExpFlag && |