[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestMultiProcessHandler.cxx 1.35 1.36 cmProcess.cxx 1.17 1.18

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Nov 16 10:58:47 EST 2009


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

Modified Files:
	cmCTestMultiProcessHandler.cxx cmProcess.cxx 
Log Message:
Handle multiple carriage return issue on windows VS9.  Also make sure that running ctest in showonly mode does not kill our cost store, since many ctest tests do this and corrupt our cost data.


Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -C 2 -d -r1.35 -r1.36
*** cmCTestMultiProcessHandler.cxx	9 Nov 2009 21:07:47 -0000	1.35
--- cmCTestMultiProcessHandler.cxx	16 Nov 2009 15:58:41 -0000	1.36
***************
*** 44,49 ****
      this->TestFinishMap[i->first] = false;
      }
!   this->ReadCostData();
!   this->CreateTestCostList();
  }
  
--- 44,52 ----
      this->TestFinishMap[i->first] = false;
      }
!   if(!this->CTest->GetShowOnly())
!     {
!     this->ReadCostData();
!     this->CreateTestCostList();
!     }
  }
  

Index: cmProcess.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmProcess.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmProcess.cxx	28 Sep 2009 15:43:05 -0000	1.17
--- cmProcess.cxx	16 Nov 2009 15:58:43 -0000	1.18
***************
*** 80,84 ****
        const char* text = &*this->begin() + this->First;
        size_type length = this->Last - this->First;
!       length -= (length && text[length-1] == '\r')? 1:0;
        line.assign(text, length);
  
--- 80,87 ----
        const char* text = &*this->begin() + this->First;
        size_type length = this->Last - this->First;
!       while(length && text[length-1] == '\r')
!         {
!         length --;
!         }
        line.assign(text, length);
  



More information about the Cmake-commits mailing list