summaryrefslogtreecommitdiff
path: root/Source/cmCTest.cxx
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-06-12 09:40:36 -0400
committerAlexander Neundorf <neundorf@kde.org>2007-06-12 09:40:36 -0400
commite9c163762ef6ff298c40a5ee3eeeb45866b7fd9b (patch)
treedfc8b710c3ff859447a45dca636918fb3eeaa684 /Source/cmCTest.cxx
parent3ca8c8d94637d03728ff259393bbffca6aba6037 (diff)
downloadcmake-e9c163762ef6ff298c40a5ee3eeeb45866b7fd9b.tar.gz
STYLE: remove argument bool fast, it was unused
Alex
Diffstat (limited to 'Source/cmCTest.cxx')
-rw-r--r--Source/cmCTest.cxx48
1 files changed, 22 insertions, 26 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 3e5d9c62e1..bd6480d353 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 )