[Cmake-commits] [cmake-commits] hoffman committed cmCTestScriptHandler.cxx 1.46 1.47

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestScriptHandler.cxx 
Log Message:
BUG: make sure error condition is reset before loading scripts


Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -C 2 -d -r1.46 -r1.47
*** cmCTestScriptHandler.cxx	19 Dec 2008 02:57:42 -0000	1.46
--- cmCTestScriptHandler.cxx	4 Mar 2009 16:24:57 -0000	1.47
***************
*** 370,373 ****
--- 370,376 ----
  int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
  {
+   // Reset the error flag so that the script is read in no matter what
+   cmSystemTools::ResetErrorOccuredFlag();
+ 
    // if the argument has a , in it then it needs to be broken into the fist
    // argument (which is the script) and the second argument which will be
***************
*** 380,384 ****
      script_arg = total_script_arg.substr(total_script_arg.find(",")+1);
      }
- 
    // make sure the file exists
    if (!cmSystemTools::FileExists(script.c_str()))
--- 383,386 ----
***************
*** 415,418 ****
--- 417,421 ----
    this->Makefile->AddFunctionBlocker(f);
  
+ 
    /* Execute CMakeDetermineSystem and CMakeSystemSpecificInformation, so 
    that variables like CMAKE_SYSTEM and also the search paths for libraries,
***************
*** 423,427 ****
    if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
        cmSystemTools::GetErrorOccuredFlag())
!     {
      return 2;
      }
--- 426,432 ----
    if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
        cmSystemTools::GetErrorOccuredFlag())
!     {  
!     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read:" 
!                << systemFile.c_str() << "\n");
      return 2;
      }
***************
*** 432,437 ****
        cmSystemTools::GetErrorOccuredFlag())
      {
!     cmCTestLog(this->CTest, DEBUG, "Error in read: "  << systemFile.c_str()
!                << std::endl);
      return 2;
      }
--- 437,442 ----
        cmSystemTools::GetErrorOccuredFlag())
      {
!     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read:" 
!                << systemFile.c_str() << "\n");
      return 2;
      }
***************
*** 441,445 ****
      cmSystemTools::GetErrorOccuredFlag())
      {
!     cmCTestLog(this->CTest, DEBUG, "Error in read script: "
                 << script.c_str()
                 << std::endl);
--- 446,450 ----
      cmSystemTools::GetErrorOccuredFlag())
      {
!     cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read script: "
                 << script.c_str()
                 << std::endl);