[Cmake-commits] [cmake-commits] zach.mullen committed cmCTestBatchTestHandler.cxx 1.4 1.5

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestBatchTestHandler.cxx 
Log Message:
More SLURM experimentation (ctest batch mode)


Index: cmCTestBatchTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBatchTestHandler.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmCTestBatchTestHandler.cxx	21 Sep 2009 18:58:30 -0000	1.4
--- cmCTestBatchTestHandler.cxx	21 Sep 2009 19:29:34 -0000	1.5
***************
*** 59,67 ****
        this->Properties[test];
  
!   fout << "srun --jobid=" << test << " ";
    fout << "-J=" << properties->Name << " ";
   
    //Write dependency information
!   if(this->Tests[test].size() > 0)
      {
        fout << "-P=afterany";
--- 59,68 ----
        this->Properties[test];
  
!   fout << "srun ";
!   //fout << "--jobid=" << test << " ";
    fout << "-J=" << properties->Name << " ";
   
    //Write dependency information
!   /*if(this->Tests[test].size() > 0)
      {
        fout << "-P=afterany";
***************
*** 72,76 ****
          }
        fout << " ";
!     }
    if(properties->RunSerial)
      {
--- 73,77 ----
          }
        fout << " ";
!     }*/
    if(properties->RunSerial)
      {
***************
*** 106,112 ****
    ++i; //the test name
    ++i; //the executable (command)
!   for(; i != args.end(); ++i)
      {
!     fout << "\"" << *i << "\" "; //args to the test executable
      }
    //TODO ZACH build TestResult.FullCommandLine
--- 107,124 ----
    ++i; //the test name
    ++i; //the executable (command)
!   if(args.size() > 2)
      {
!     fout << "'";
!     }
!   while(i != args.end())
!     {
!     fout << "\"" << *i << "\""; //args to the test executable
!     ++i;
! 
!     if(i == args.end() && args.size() > 2)
!       {
!       fout << "'";
!       }
!     fout << " ";
      }
    //TODO ZACH build TestResult.FullCommandLine