diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-09-02 14:08:40 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-09-02 14:08:40 (GMT) |
| commit | 69fd641adb32c878ded4cadee60d90596b358d1b (patch) | |
| tree | cd9885d9d8a0825b4a3bc227f78780ebf1a1e95b /Modules | |
| parent | 99144383cf17e188f67a5d9e3469bcf1b3a836b8 (diff) | |
| download | CMake-69fd641adb32c878ded4cadee60d90596b358d1b.zip CMake-69fd641adb32c878ded4cadee60d90596b358d1b.tar.gz CMake-69fd641adb32c878ded4cadee60d90596b358d1b.tar.bz2 | |
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
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CTest.cmake | 8 | ||||
| -rw-r--r-- | Modules/DartConfiguration.tcl.in | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index b3871db..c13b813 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -137,6 +137,12 @@ IF(BUILD_TESTING) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]" 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") FIND_PROGRAM(SCPCOMMAND scp DOC @@ -212,6 +218,8 @@ IF(BUILD_TESTING) MEMORYCHECK_SUPPRESSIONS_FILE PURIFYCOMMAND SCPCOMMAND + SLURM_SBATCH_COMMAND + SLURM_SRUN_COMMAND SITE ) # BUILDNAME diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 2cd8437..7b79a3d 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -54,10 +54,14 @@ MemoryCheckCommandOptions: @MEMORYCHECK_COMMAND_OPTIONS@ MemoryCheckSuppressionFile: @MEMORYCHECK_SUPPRESSIONS_FILE@ 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 summaily terminated. +# process will be summarily terminated. # Currently set to 25 minutes TimeOut: @DART_TESTING_TIMEOUT@ |