[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx 1.20.2.2 1.20.2.3 cmCTestBuildHandler.cxx 1.61.2.1 1.61.2.2 cmCTestUpdateHandler.cxx 1.41.2.1 1.41.2.2

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jan 13 13:03:56 EST 2009


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

Modified Files:
      Tag: CMake-2-6
	cmCTestBuildAndTestHandler.cxx cmCTestBuildHandler.cxx 
	cmCTestUpdateHandler.cxx 
Log Message:
ENH: merge in changes from CVS to branch for 2.6.3 RC 8


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -C 2 -d -r1.41.2.1 -r1.41.2.2
*** cmCTestUpdateHandler.cxx	24 Oct 2008 15:18:55 -0000	1.41.2.1
--- cmCTestUpdateHandler.cxx	13 Jan 2009 18:03:54 -0000	1.41.2.2
***************
*** 181,184 ****
--- 181,224 ----
  //----------------------------------------------------------------------
  
+ class cmCTestUpdateHandlerLocale
+ {
+ public:
+   cmCTestUpdateHandlerLocale();
+   ~cmCTestUpdateHandlerLocale();
+ private:
+   std::string saveLCMessages;
+ };
+ 
+ cmCTestUpdateHandlerLocale::cmCTestUpdateHandlerLocale()
+ {
+   const char* lcmess = cmSystemTools::GetEnv("LC_MESSAGES");
+   if(lcmess)
+     {
+     saveLCMessages = lcmess;
+     }
+   // if LC_MESSAGES is not set to C, then
+   // set it, so that svn/cvs info will be in english ascii
+   if(! (lcmess && strcmp(lcmess, "C") == 0))
+     {
+     cmSystemTools::PutEnv("LC_MESSAGES=C");
+     }
+ }
+ 
+ cmCTestUpdateHandlerLocale::~cmCTestUpdateHandlerLocale()
+ {
+   // restore the value of LC_MESSAGES after running the version control
+   // commands
+   if(saveLCMessages.size())
+     {
+     std::string put = "LC_MESSAGES=";
+     put += saveLCMessages;
+     cmSystemTools::PutEnv(put.c_str());
+     }
+   else
+     {
+     cmSystemTools::UnsetEnv("LC_MESSAGES");
+     }
+ }
+ 
  //----------------------------------------------------------------------
  cmCTestUpdateHandler::cmCTestUpdateHandler()
***************
*** 253,269 ****
    std::string errors;
  
!   // make sure 
!   std::string saveLCMessages;
!   const char* lcmess = cmSystemTools::GetEnv("LC_MESSAGES");
!   if(lcmess)
!     {
!     saveLCMessages = lcmess;
!     }
!   // if LC_MESSAGES is not set to C, then 
!   // set it, so that svn/cvs info will be in english ascii
!   if(! (lcmess && strcmp(lcmess, "C") == 0))
!     {
!     cmSystemTools::PutEnv("LC_MESSAGES=C");
!     }
    std::string checkoutErrorMessages;
    int retVal = 0;
--- 293,300 ----
    std::string errors;
  
!   // Make sure VCS tool messages are in English so we can parse them.
!   cmCTestUpdateHandlerLocale fixLocale;
!   static_cast<void>(fixLocale);
! 
    std::string checkoutErrorMessages;
    int retVal = 0;
***************
*** 333,337 ****
      if(!this->CTest->InitializeFromCommand(this->Command))
        {
!       cmCTestLog(this->CTest, HANDLER_OUTPUT, 
                   " Fatal Error in initialize: "
                   << std::endl);
--- 364,368 ----
      if(!this->CTest->InitializeFromCommand(this->Command))
        {
!       cmCTestLog(this->CTest, HANDLER_OUTPUT,
                   " Fatal Error in initialize: "
                   << std::endl);
***************
*** 1123,1138 ****
    os << "</UpdateReturnStatus>" << std::endl;
    os << "</Update>" << std::endl;
-   // restore the value of LC_MESSAGES after running the version control
-   // commands
-   if(saveLCMessages.size())
-     {
-     std::string put = "LC_MESSAGES=";
-     put += saveLCMessages;
-     cmSystemTools::PutEnv(put.c_str());
-     }
-   else
-     {
-     cmSystemTools::UnsetEnv("LC_MESSAGES");
-     }
    if (! res  )
      {
--- 1154,1157 ----

Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -C 2 -d -r1.20.2.2 -r1.20.2.3
*** cmCTestBuildAndTestHandler.cxx	4 Sep 2008 21:10:45 -0000	1.20.2.2
--- cmCTestBuildAndTestHandler.cxx	13 Jan 2009 18:03:54 -0000	1.20.2.3
***************
*** 360,367 ****
      cmSystemTools::ChangeDirectory(this->BuildRunDir.c_str());
      }
!   out << "Running test executable: " << fullPath << " ";
    for(k=0; k < this->TestCommandArgs.size(); ++k)
      {
!     out << this->TestCommandArgs[k] << " ";
      }
    out << "\n";
--- 360,367 ----
      cmSystemTools::ChangeDirectory(this->BuildRunDir.c_str());
      }
!   out << "Running test command: \"" << fullPath << "\"";
    for(k=0; k < this->TestCommandArgs.size(); ++k)
      {
!     out << " \"" << this->TestCommandArgs[k] << "\"";
      }
    out << "\n";
***************
*** 387,391 ****
    if(runTestRes != cmsysProcess_State_Exited || retval != 0)
      {
!     out << "Failed to run test command: " << testCommand[0] << "\n";
      retval = 1;
      }
--- 387,391 ----
    if(runTestRes != cmsysProcess_State_Exited || retval != 0)
      {
!     out << "Test command failed: " << testCommand[0] << "\n";
      retval = 1;
      }

Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.61.2.1
retrieving revision 1.61.2.2
diff -C 2 -d -r1.61.2.1 -r1.61.2.2
*** cmCTestBuildHandler.cxx	24 Mar 2008 22:23:26 -0000	1.61.2.1
--- cmCTestBuildHandler.cxx	13 Jan 2009 18:03:54 -0000	1.61.2.2
***************
*** 166,170 ****
      { "^Warning W[0-9]+ ([a-zA-Z.\\:/0-9_+ ~-]+) ([0-9]+):", 1, 2 },
      { "^([a-zA-Z./0-9_+ ~-]+):([0-9]+):", 1, 2 },
!     { "^([a-zA-Z.\\:/0-9_+ ~-]+)\\(([0-9]+)\\)", 1, 2 },
      { "^([a-zA-Z./0-9_+ ~-]+)\\(([0-9]+)\\)", 1, 2 },
      { "\"([a-zA-Z./0-9_+ ~-]+)\", line ([0-9]+)", 1, 2 },
--- 166,171 ----
      { "^Warning W[0-9]+ ([a-zA-Z.\\:/0-9_+ ~-]+) ([0-9]+):", 1, 2 },
      { "^([a-zA-Z./0-9_+ ~-]+):([0-9]+):", 1, 2 },
!     { "^([a-zA-Z.\\:/0-9_+ ~-]+)\\(([0-9]+)\\)", 1, 2 }, 
!     { "^[0-9]+>([a-zA-Z.\\:/0-9_+ ~-]+)\\(([0-9]+)\\)", 1, 2 },
      { "^([a-zA-Z./0-9_+ ~-]+)\\(([0-9]+)\\)", 1, 2 },
      { "\"([a-zA-Z./0-9_+ ~-]+)\", line ([0-9]+)", 1, 2 },



More information about the Cmake-commits mailing list