[Cmake-commits] [cmake-commits] david.cole committed cmCTestBuildAndTestHandler.cxx 1.22 1.23 cmCTestTestHandler.cxx 1.81 1.82 cmCTestTestHandler.h 1.29 1.30

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestBuildAndTestHandler.cxx cmCTestTestHandler.cxx 
	cmCTestTestHandler.h 
Log Message:
ENH: Implement feature request from issue 7885. Allow setting environment variables on a per-test basis for ctest using set_test_properties ENVIRONMENT.


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.81
retrieving revision 1.82
diff -C 2 -d -r1.81 -r1.82
*** cmCTestTestHandler.cxx	1 Oct 2008 13:04:27 -0000	1.81
--- cmCTestTestHandler.cxx	26 Nov 2008 19:38:43 -0000	1.82
***************
*** 734,742 ****
      {
      res = this->CTest->RunTest(arguments, &output, &retVal, this->LogFile,
!                                it->Timeout);
      }
!   
!   clock_finish = cmSystemTools::GetTime();
!   
    if ( this->LogFile )
      {
--- 734,742 ----
      {
      res = this->CTest->RunTest(arguments, &output, &retVal, this->LogFile,
!                                it->Timeout, &it->Environment);
      }
! 
!   clock_finish = cmSystemTools::GetTime();  
! 
    if ( this->LogFile )
      {
***************
*** 2210,2214 ****
              }
            if ( key == "DEPENDS" )
!             { 
              std::vector<std::string> lval;
              cmSystemTools::ExpandListArgument(val.c_str(), lval);
--- 2210,2214 ----
              }
            if ( key == "DEPENDS" )
!             {
              std::vector<std::string> lval;
              cmSystemTools::ExpandListArgument(val.c_str(), lval);
***************
*** 2219,2222 ****
--- 2219,2232 ----
                }
              }
+           if ( key == "ENVIRONMENT" )
+             { 
+             std::vector<std::string> lval;
+             cmSystemTools::ExpandListArgument(val.c_str(), lval);
+             std::vector<std::string>::iterator crit;
+             for ( crit = lval.begin(); crit != lval.end(); ++ crit )
+               {
+               rtit->Environment.push_back(*crit);
+               }
+             }
            if ( key == "MEASUREMENT" )
              {

Index: cmCTestTestHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** cmCTestTestHandler.h	6 Jul 2008 23:58:38 -0000	1.29
--- cmCTestTestHandler.h	26 Nov 2008 19:38:43 -0000	1.30
***************
*** 91,94 ****
--- 91,95 ----
      double Timeout;
      int Index;
+     std::vector<std::string> Environment;
    };
  

Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** cmCTestBuildAndTestHandler.cxx	4 Sep 2008 15:31:10 -0000	1.22
--- cmCTestBuildAndTestHandler.cxx	26 Nov 2008 19:38:43 -0000	1.23
***************
*** 383,387 ****
    
    int runTestRes = this->CTest->RunTest(testCommand, &outs, &retval, 0, 
!                                         remainingTime);
  
    if(runTestRes != cmsysProcess_State_Exited || retval != 0)
--- 383,387 ----
    
    int runTestRes = this->CTest->RunTest(testCommand, &outs, &retval, 0, 
!                                         remainingTime, 0);
  
    if(runTestRes != cmsysProcess_State_Exited || retval != 0)