summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-11-12 14:13:00 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-11-12 14:14:39 (GMT)
commit8be538b092df5f9b0c2eeb9bafa9ebb0e8660001 (patch)
treeaf38fb9e9a010307ceb7246491e77d53b9df8610
parent7ac092bd39c9e5905aa612e9f94e5870e7870011 (diff)
parentaa754e29131d71258fec007ee6692d1a1d352afd (diff)
downloadCMake-8be538b092df5f9b0c2eeb9bafa9ebb0e8660001.zip
CMake-8be538b092df5f9b0c2eeb9bafa9ebb0e8660001.tar.gz
CMake-8be538b092df5f9b0c2eeb9bafa9ebb0e8660001.tar.bz2
Merge topic 'ctest-batch'
aa754e2913 CTest: Remove additional batch test variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5494
-rw-r--r--Modules/CTest.cmake8
-rw-r--r--Modules/DartConfiguration.tcl.in4
2 files changed, 0 insertions, 12 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake
index 8d04be3..a18e85b 100644
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
@@ -179,12 +179,6 @@ 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(COVERAGE_COMMAND gcov DOC
@@ -263,8 +257,6 @@ if(BUILD_TESTING)
MAKECOMMAND
MEMORYCHECK_COMMAND
MEMORYCHECK_SUPPRESSIONS_FILE
- SLURM_SBATCH_COMMAND
- SLURM_SRUN_COMMAND
SITE
SVNCOMMAND
)
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index d318c26..41cb9b7 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -83,10 +83,6 @@ MemoryCheckSuppressionFile: @MEMORYCHECK_SUPPRESSIONS_FILE@
CoverageCommand: @COVERAGE_COMMAND@
CoverageExtraFlags: @COVERAGE_EXTRA_FLAGS@
-# 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