[Cmake-commits] [cmake-commits] king committed cmCTestBuildHandler.cxx 1.71 1.72
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 12 10:01:41 EST 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv4655/Source/CTest
Modified Files:
cmCTestBuildHandler.cxx
Log Message:
BUG: Do not drop build fragments with same time
When we collect Build.xml fragments generated by 'ctest --launch', this
lexicographically orders fragments with the same time stamp on disk
instead of incorrectly dropping duplicates.
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.71
retrieving revision 1.72
diff -C 2 -d -r1.71 -r1.72
*** cmCTestBuildHandler.cxx 11 Feb 2009 20:18:08 -0000 1.71
--- cmCTestBuildHandler.cxx 12 Feb 2009 15:01:39 -0000 1.72
***************
*** 536,543 ****
bool operator()(std::string const& l, std::string const& r)
{
! // Order files by modification time. If comparison fails, just
! // use lexicographic order (should not happen in our use case).
int result;
! if(this->FTC->FileTimeCompare(l.c_str(), r.c_str(), &result))
{
return result < 0;
--- 536,544 ----
bool operator()(std::string const& l, std::string const& r)
{
! // Order files by modification time. Use lexicographic order
! // among files with the same time.
int result;
! if(this->FTC->FileTimeCompare(l.c_str(), r.c_str(), &result) &&
! result != 0)
{
return result < 0;
More information about the Cmake-commits
mailing list