exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve BUILDNAME in case of mercurial. Collateral damage: Timeout consistent

Browse source
This commit is contained in:
bgschaid@ice-sf.at 2014-05-16 10:00:07 +00:00
parent f3d7e5e588
commit ee28daa3a5
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -96,10 +96,10 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
# DART_TESTING_TIMEOUT 14400 # DART_TESTING_TIMEOUT 14400
# CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test." # CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test."
#) #)
# Timeout for running all this: 10 minutes : 600 seconds # Timeout for running all this: 20 minutes : 1200 seconds (for debug)
SET( SET(
DART_TESTING_TIMEOUT 600 DART_TESTING_TIMEOUT 1200
CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test." CACHE STRING "Maximum time allowed (20 minutes) before CTest will kill the test."
) )
SET( SET(
@ -127,12 +127,14 @@ if(GIT_FOUND)
if (GIT_BRANCH_NAME STREQUAL "") if (GIT_BRANCH_NAME STREQUAL "")
message("No git-branch. Mercurial?") message("No git-branch. Mercurial?")
EXEC_PROGRAM(hg EXEC_PROGRAM(hg
ARGS branch ARGS id
OUTPUT_VARIABLE GIT_BRANCH_NAME OUTPUT_VARIABLE GIT_BRANCH_NAME
) )
message("Git branch (mercurial): ${GIT_BRANCH_NAME}") message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif() endif()
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'")
string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME})
endif() endif()
# Some last minute cleanup # Some last minute cleanup
@ -140,7 +142,6 @@ endif()
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME}) string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
string(REPLACE "/" "_" SITE ${SITE}) string(REPLACE "/" "_" SITE ${SITE})
# Build section # Build section
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

7
testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt
View file

@ -127,12 +127,14 @@ if(GIT_FOUND)
if (GIT_BRANCH_NAME STREQUAL "") if (GIT_BRANCH_NAME STREQUAL "")
message("No git-branch. Mercurial?") message("No git-branch. Mercurial?")
EXEC_PROGRAM(hg EXEC_PROGRAM(hg
ARGS branch ARGS id
OUTPUT_VARIABLE GIT_BRANCH_NAME OUTPUT_VARIABLE GIT_BRANCH_NAME
) )
message("Git branch (mercurial): ${GIT_BRANCH_NAME}") message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif() endif()
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") SET(BUILDNAME "${BUILDNAME}-git-branch='hg_${GIT_BRANCH_NAME}'")
string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
string(REPLACE "+" "_modified" BUILDNAME ${BUILDNAME})
endif() endif()
# Some last minute cleanup # Some last minute cleanup
@ -140,7 +142,6 @@ endif()
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME}) string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
string(REPLACE "/" "_" SITE ${SITE}) string(REPLACE "/" "_" SITE ${SITE})
# Build section # Build section
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------