diff options
| -rw-r--r-- | Source/cmCTest.cxx | 48 | ||||
| -rw-r--r-- | Source/cmCTest.h | 3 |
2 files changed, 23 insertions, 28 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 3e5d9c6..bd6480d 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2040,8 +2040,7 @@ void cmCTest::SetNotesFiles(const char* notes) } //---------------------------------------------------------------------- -int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf, - bool fast /* = false */) +int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf) { bool found = false; VectorOfStrings dirs; @@ -2074,34 +2073,31 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf, } } - if ( !fast ) - { - std::string rexpr = dir; - rexpr += "/CTestCustom.ctest"; - cmCTestLog(this, DEBUG, "* Check for file: " - << rexpr.c_str() << std::endl); - if ( !found && cmSystemTools::FileExists(rexpr.c_str()) ) - { - cmsys::Glob gl; - gl.RecurseOn(); - gl.FindFiles(rexpr); - std::vector<std::string>& files = gl.GetFiles(); - std::vector<std::string>::iterator fileIt; - for ( fileIt = files.begin(); fileIt != files.end(); - ++ fileIt ) + std::string rexpr = dir; + rexpr += "/CTestCustom.ctest"; + cmCTestLog(this, DEBUG, "* Check for file: " + << rexpr.c_str() << std::endl); + if ( !found && cmSystemTools::FileExists(rexpr.c_str()) ) + { + cmsys::Glob gl; + gl.RecurseOn(); + gl.FindFiles(rexpr); + std::vector<std::string>& files = gl.GetFiles(); + std::vector<std::string>::iterator fileIt; + for ( fileIt = files.begin(); fileIt != files.end(); + ++ fileIt ) + { + cmCTestLog(this, DEBUG, "* Read custom CTest configuration file: " + << fileIt->c_str() << std::endl); + if ( !mf->ReadListFile(0, fileIt->c_str()) || + cmSystemTools::GetErrorOccuredFlag() ) { - cmCTestLog(this, DEBUG, "* Read custom CTest configuration file: " + cmCTestLog(this, ERROR_MESSAGE, + "Problem reading custom configuration: " << fileIt->c_str() << std::endl); - if ( !mf->ReadListFile(0, fileIt->c_str()) || - cmSystemTools::GetErrorOccuredFlag() ) - { - cmCTestLog(this, ERROR_MESSAGE, - "Problem reading custom configuration: " - << fileIt->c_str() << std::endl); - } } - found = true; } + found = true; } if ( found ) diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 298f5a0..99ccf0a 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -301,8 +301,7 @@ public: SetOfStrings* GetSubmitFiles() { return &this->SubmitFiles; } //! Read the custom configuration files and apply them to the current ctest - int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf, - bool fast = false); + int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf); std::vector<cmStdString> &GetInitialCommandLineArguments() { return this->InitialCommandLineArguments; }; |