[cmake-commits] alex committed cmCTest.h 1.97 1.98 cmCTest.cxx 1.321 1.322

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17862

Modified Files:
	cmCTest.h cmCTest.cxx 
Log Message:

STYLE: remove argument bool fast, it was unused

Alex


Index: cmCTest.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- cmCTest.h	25 Jan 2007 16:16:15 -0000	1.97
+++ cmCTest.h	12 Jun 2007 13:40:36 -0000	1.98
@@ -301,8 +301,7 @@
   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; };

Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- cmCTest.cxx	11 Jun 2007 19:36:50 -0000	1.321
+++ cmCTest.cxx	12 Jun 2007 13:40:36 -0000	1.322
@@ -2040,8 +2040,7 @@
 }
 
 //----------------------------------------------------------------------
-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 @@
       }
     }
 
-  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()) )
     {
-    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 )
       {
-      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 )