kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150) 

Also, split a long line into two. And alphabetize the
variables mentioned in the mark_as_advanced call.
This commit is contained in:
David Cole 2011-01-28 06:32:27 -05:00
parent 6744616fb2
commit b5e3692299
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Modules/CTest.cmake
View File

@ -63,7 +63,8 @@ OPTION(BUILD_TESTING "Build the testing tree." ON)
# function to turn generator name into a version string # function to turn generator name into a version string
# like vs7 vs71 vs8 vs9 # like vs7 vs71 vs8 vs9
FUNCTION(GET_VS_VERSION_STRING generator var) FUNCTION(GET_VS_VERSION_STRING generator var)
STRING(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1" NUMBER "${generator}") STRING(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1"
NUMBER "${generator}")
IF("${generator}" MATCHES "Visual Studio 7 .NET 2003") IF("${generator}" MATCHES "Visual Studio 7 .NET 2003")
SET(ver_string "vs71") SET(ver_string "vs71")
ELSE("${generator}" MATCHES "Visual Studio 7 .NET 2003") ELSE("${generator}" MATCHES "Visual Studio 7 .NET 2003")
@ -253,15 +254,16 @@ IF(BUILD_TESTING)
ENDIF(CTEST_USE_LAUNCHERS) ENDIF(CTEST_USE_LAUNCHERS)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
COVERAGE_COMMAND
CVSCOMMAND
SVNCOMMAND
BZRCOMMAND BZRCOMMAND
HGCOMMAND
GITCOMMAND
CVS_UPDATE_OPTIONS
SVN_UPDATE_OPTIONS
BZR_UPDATE_OPTIONS BZR_UPDATE_OPTIONS
COVERAGE_COMMAND
CTEST_SUBMIT_RETRY_DELAY
CTEST_SUBMIT_RETRY_COUNT
CVSCOMMAND
CVS_UPDATE_OPTIONS
DART_TESTING_TIMEOUT
GITCOMMAND
HGCOMMAND
MAKECOMMAND MAKECOMMAND
MEMORYCHECK_COMMAND MEMORYCHECK_COMMAND
MEMORYCHECK_SUPPRESSIONS_FILE MEMORYCHECK_SUPPRESSIONS_FILE
@ -270,10 +272,9 @@ IF(BUILD_TESTING)
SLURM_SBATCH_COMMAND SLURM_SBATCH_COMMAND
SLURM_SRUN_COMMAND SLURM_SRUN_COMMAND
SITE SITE
CTEST_SUBMIT_RETRY_DELAY SVNCOMMAND
CTEST_SUBMIT_RETRY_COUNT SVN_UPDATE_OPTIONS
) )
# BUILDNAME
IF(NOT RUN_FROM_DART) IF(NOT RUN_FROM_DART)
SET(RUN_FROM_CTEST_OR_DART 1) SET(RUN_FROM_CTEST_OR_DART 1)
INCLUDE(CTestTargets) INCLUDE(CTestTargets)