[Cmake-commits] [cmake-commits] king committed cmCTestBZR.cxx 1.2.2.1 1.2.2.2 cmCTestConfigureCommand.cxx 1.12.2.2 1.12.2.3 cmCTestGIT.cxx 1.2.2.2 1.2.2.3 cmCTestMultiProcessHandler.cxx 1.25.2.8 1.25.2.9

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	cmCTestBZR.cxx cmCTestConfigureCommand.cxx cmCTestGIT.cxx 
	cmCTestMultiProcessHandler.cxx 
Log Message:
CMake 2.8.1-rc2


Index: cmCTestMultiProcessHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMultiProcessHandler.cxx,v
retrieving revision 1.25.2.8
retrieving revision 1.25.2.9
diff -C 2 -d -r1.25.2.8 -r1.25.2.9
*** cmCTestMultiProcessHandler.cxx	28 Jan 2010 21:48:01 -0000	1.25.2.8
--- cmCTestMultiProcessHandler.cxx	11 Feb 2010 15:50:42 -0000	1.25.2.9
***************
*** 326,330 ****
      + "/Testing/Temporary/CTestCostData.txt";
    std::fstream fout;
!   fout.open(fname.c_str(), std::ios::app);
    fout << index << " " << cost << "\n";
    fout.close();
--- 326,330 ----
      + "/Testing/Temporary/CTestCostData.txt";
    std::fstream fout;
!   fout.open(fname.c_str(), std::ios::out | std::ios::app);
    fout << index << " " << cost << "\n";
    fout.close();

Index: cmCTestGIT.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestGIT.cxx,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** cmCTestGIT.cxx	28 Jan 2010 21:48:01 -0000	1.2.2.2
--- cmCTestGIT.cxx	11 Feb 2010 15:50:42 -0000	1.2.2.3
***************
*** 410,417 ****
  void cmCTestGIT::LoadModifications()
  {
-   // Use 'git diff-index' to get modified files.
    const char* git = this->CommandLineTool.c_str();
-   const char* git_diff_index[] = {git, "diff-index", "-z", "HEAD", 0};
  
    DiffParser out(this, "di-out> ");
    OutputLogger err(this->Log, "di-err> ");
--- 410,423 ----
  void cmCTestGIT::LoadModifications()
  {
    const char* git = this->CommandLineTool.c_str();
  
+   // Use 'git update-index' to refresh the index w.r.t. the work tree.
+   const char* git_update_index[] = {git, "update-index", "--refresh", 0};
+   OutputLogger ui_out(this->Log, "ui-out> ");
+   OutputLogger ui_err(this->Log, "ui-err> ");
+   this->RunChild(git_update_index, &ui_out, &ui_err);
+ 
+   // Use 'git diff-index' to get modified files.
+   const char* git_diff_index[] = {git, "diff-index", "-z", "HEAD", 0};
    DiffParser out(this, "di-out> ");
    OutputLogger err(this->Log, "di-err> ");

Index: cmCTestBZR.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBZR.cxx,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** cmCTestBZR.cxx	1 Oct 2009 21:21:12 -0000	1.2.2.1
--- cmCTestBZR.cxx	11 Feb 2010 15:50:42 -0000	1.2.2.2
***************
*** 277,280 ****
--- 277,281 ----
        {
        this->CurChange.Path.assign(&this->CData[0], this->CData.size());
+       cmSystemTools::ConvertToUnixSlashes(this->CurChange.Path);
        this->Changes.push_back(this->CurChange);
        }
***************
*** 283,286 ****
--- 284,288 ----
        // symlinks have an arobase at the end in the log
        this->CurChange.Path.assign(&this->CData[0], this->CData.size()-1);
+       cmSystemTools::ConvertToUnixSlashes(this->CurChange.Path);
        this->Changes.push_back(this->CurChange);
        }
***************
*** 378,384 ****
      }
  
!   void DoPath(char c0, char c1, char c2, std::string const& path)
      {
      if(path.empty()) return;
  
      const std::string dir = cmSystemTools::GetFilenamePath(path);
--- 380,387 ----
      }
  
!   void DoPath(char c0, char c1, char c2, std::string path)
      {
      if(path.empty()) return;
+     cmSystemTools::ConvertToUnixSlashes(path);
  
      const std::string dir = cmSystemTools::GetFilenamePath(path);
***************
*** 489,495 ****
      }
  
!   void DoPath(char c0, char c1, char c2, std::string const& path)
      {
      if(path.empty()) return;
  
      if ( c0=='C' )
--- 492,499 ----
      }
  
!   void DoPath(char c0, char c1, char c2, std::string path)
      {
      if(path.empty()) return;
+     cmSystemTools::ConvertToUnixSlashes(path);
  
      if ( c0=='C' )

Index: cmCTestConfigureCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestConfigureCommand.cxx,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C 2 -d -r1.12.2.2 -r1.12.2.3
*** cmCTestConfigureCommand.cxx	28 Jan 2010 21:48:01 -0000	1.12.2.2
--- cmCTestConfigureCommand.cxx	11 Feb 2010 15:50:42 -0000	1.12.2.3
***************
*** 133,137 ****
          }
  
!       if (!multiConfig && !cmakeBuildTypeInOptions)
          {
          cmakeConfigureCommand += " \"-DCMAKE_BUILD_TYPE:STRING=";
--- 133,138 ----
          }
  
!       if (!multiConfig && !cmakeBuildTypeInOptions &&
!           !this->CTest->GetConfigType().empty())
          {
          cmakeConfigureCommand += " \"-DCMAKE_BUILD_TYPE:STRING=";