[Cmake-commits] [cmake-commits] king committed cmCTestUpdateCommand.h 1.7 1.8 cmCTestUpdateHandler.cxx 1.63 1.64

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Mar 20 14:19:58 EDT 2009


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

Modified Files:
	cmCTestUpdateCommand.h cmCTestUpdateHandler.cxx 
Log Message:
BUG: Fix return value of ctest_update

The CTest version control refactoring broke the value returned for the
ctest_update command's RETURN_VALUE argument.  The value is supposed to
be the number of files updated, but the refactoring accidentally made it
the number of locally modified files after the update.


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.63
retrieving revision 1.64
diff -C 2 -d -r1.63 -r1.64
*** cmCTestUpdateHandler.cxx	26 Feb 2009 14:22:32 -0000	1.63
--- cmCTestUpdateHandler.cxx	20 Mar 2009 18:19:56 -0000	1.64
***************
*** 249,253 ****
  
    int localModifications = 0;
!   if(int numUpdated = vc->GetPathCount(cmCTestVC::PathUpdated))
      {
      cmCTestLog(this->CTest, HANDLER_OUTPUT,
--- 249,254 ----
  
    int localModifications = 0;
!   int numUpdated = vc->GetPathCount(cmCTestVC::PathUpdated);
!   if(numUpdated)
      {
      cmCTestLog(this->CTest, HANDLER_OUTPUT,
***************
*** 291,295 ****
    os << "</UpdateReturnStatus>" << std::endl;
    os << "</Update>" << std::endl;
!   return localModifications;
  }
  
--- 292,296 ----
    os << "</UpdateReturnStatus>" << std::endl;
    os << "</Update>" << std::endl;
!   return numUpdated;
  }
  

Index: cmCTestUpdateCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateCommand.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmCTestUpdateCommand.h	20 Feb 2009 20:50:57 -0000	1.7
--- cmCTestUpdateCommand.h	20 Mar 2009 18:19:55 -0000	1.8
***************
*** 65,70 ****
        "If no SOURCE is given, the CTEST_SOURCE_DIRECTORY variable is used. "
        "The RETURN_VALUE option specifies a variable in which to store the "
!       "result, which is -1 on error, non-negative for success, and positive "
!       "if there are local modifications in the work tree."
        ;
      }
--- 65,69 ----
        "If no SOURCE is given, the CTEST_SOURCE_DIRECTORY variable is used. "
        "The RETURN_VALUE option specifies a variable in which to store the "
!       "result, which is the number of files updated or -1 on error."
        ;
      }



More information about the Cmake-commits mailing list