[Cmake-commits] [cmake-commits] zach.mullen committed CTest.cmake 1.18 1.19 DartConfiguration.tcl.in 1.10 1.11

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv7559/Modules

Modified Files:
	CTest.cmake DartConfiguration.tcl.in 
Log Message:
Fixed ctest output where max test index is not the same width as the total number of tests.  Also some preliminary changes for batching ctest jobs


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** CTest.cmake	10 Jul 2009 15:07:41 -0000	1.18
--- CTest.cmake	2 Sep 2009 14:08:38 -0000	1.19
***************
*** 138,141 ****
--- 138,147 ----
      DOC "Path to the memory checking command, used for memory error detection."
      )
+   FIND_PROGRAM(SLURM_SBATCH_COMMAND sbatch DOC
+     "Path to the SLURM sbatch executable"
+     )
+   FIND_PROGRAM(SLURM_SRUN_COMMAND srun DOC
+     "Path to the SLURM srun executable"
+     )
    SET(MEMORYCHECK_SUPPRESSIONS_FILE "" CACHE FILEPATH 
      "File that contains suppressions for the memory checker")
***************
*** 213,216 ****
--- 219,224 ----
      PURIFYCOMMAND
      SCPCOMMAND
+     SLURM_SBATCH_COMMAND
+     SLURM_SRUN_COMMAND
      SITE 
      )

Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** DartConfiguration.tcl.in	17 Apr 2009 18:44:00 -0000	1.10
--- DartConfiguration.tcl.in	2 Sep 2009 14:08:38 -0000	1.11
***************
*** 55,62 ****
  CoverageCommand: @COVERAGE_COMMAND@
  
  # Testing options
  # TimeOut is the amount of time in seconds to wait for processes
  # to complete during testing.  After TimeOut seconds, the
! # process will be summaily terminated.
  # Currently set to 25 minutes
  TimeOut: @DART_TESTING_TIMEOUT@
--- 55,66 ----
  CoverageCommand: @COVERAGE_COMMAND@
  
+ # Cluster commands
+ SlurmBatchCommand: @SLURM_SBATCH_COMMAND@
+ SlurmRunCommand: @SLURM_SRUN_COMMAND@
+ 
  # Testing options
  # TimeOut is the amount of time in seconds to wait for processes
  # to complete during testing.  After TimeOut seconds, the
! # process will be summarily terminated.
  # Currently set to 25 minutes
  TimeOut: @DART_TESTING_TIMEOUT@