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

Changes from Martin Beaudoin: test loop

Browse source
This commit is contained in:
Hrvoje Jasak 2010-10-15 22:24:50 +01:00
parent ef4664773e
commit cabe00e177
2 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
CMakeLists.txt
View file

@ -1,10 +1,10 @@
# /*---------------------------------------------------------------------------*\ # /*-------------------------------------------------------------------------*\
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright held by original author # \\ / A nd | Copyright held by original author
# \\/ M anipulation | # \\/ M anipulation |
# ------------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM.
# #
@ -33,7 +33,7 @@
# Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved
# #
# #
# \*---------------------------------------------------------------------------*/ # \*-------------------------------------------------------------------------*/
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
@ -82,14 +82,12 @@ SET(
# Find out the version of the compiler being used. # Find out the version of the compiler being used.
# Add this information to the buildname # Add this information to the buildname
# This is for gcc # This is for gcc or icc because they both support the -dumpversion option
IF(CMAKE_COMPILER_IS_GNUCC) EXEC_PROGRAM($ENV{WM_CC}
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
ARGS -dumpversion ARGS -dumpversion
OUTPUT_VARIABLE COMPILER_VERSION OUTPUT_VARIABLE COMPILER_VERSION
) )
SET(BUILDNAME "${BUILDNAME}-gcc${COMPILER_VERSION}") SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
# #
# We will support more compilers eventually. # We will support more compilers eventually.
# #
@ -99,7 +97,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
# 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 secondes # Timeout for running all this: 10 minutes : 600 seconds
SET( SET(
DART_TESTING_TIMEOUT 600 DART_TESTING_TIMEOUT 600
CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test." CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test."
@ -120,8 +118,21 @@ set (UPDATE_TYPE git)
find_package(Git) find_package(Git)
if(GIT_FOUND) if(GIT_FOUND)
message("Git was found: ${GIT_EXECUTABLE}") message("Git was found: ${GIT_EXECUTABLE}")
# Adding the name of the git branch to the build name
EXEC_PROGRAM(git
ARGS branch --no-color 2> /dev/null | grep '*'| awk '{print $2}'
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
message("Git branch: ${GIT_BRANCH_NAME}")
SET(BUILDNAME "${BUILDNAME}-git-branch:${GIT_BRANCH_NAME}")
endif() endif()
# Some last minute cleanup
# Seems like no '/' are allowed in the BUILDNAME or in the SITE name
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
string(REPLACE "/" "_" SITE ${SITE})
# Build section # Build section
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

31
testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt
View file

@ -1,10 +1,10 @@
# /*---------------------------------------------------------------------------*\ # /*-------------------------------------------------------------------------*\
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright held by original author # \\ / A nd | Copyright held by original author
# \\/ M anipulation | # \\/ M anipulation |
# ------------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM.
# #
@ -33,7 +33,7 @@
# Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved
# #
# #
# \*---------------------------------------------------------------------------*/ # \*-------------------------------------------------------------------------*/
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
@ -82,14 +82,12 @@ SET(
# Find out the version of the compiler being used. # Find out the version of the compiler being used.
# Add this information to the buildname # Add this information to the buildname
# This is for gcc # This is for gcc or icc because they both support the -dumpversion option
IF(CMAKE_COMPILER_IS_GNUCC) EXEC_PROGRAM($ENV{WM_CC}
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
ARGS -dumpversion ARGS -dumpversion
OUTPUT_VARIABLE COMPILER_VERSION OUTPUT_VARIABLE COMPILER_VERSION
) )
SET(BUILDNAME "${BUILDNAME}-gcc${COMPILER_VERSION}") SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
# #
# We will support more compilers eventually. # We will support more compilers eventually.
# #
@ -99,7 +97,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
# 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 secondes # Timeout for running all this: 10 minutes : 600 seconds
SET( SET(
DART_TESTING_TIMEOUT 600 DART_TESTING_TIMEOUT 600
CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test." CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test."
@ -120,8 +118,21 @@ set (UPDATE_TYPE git)
find_package(Git) find_package(Git)
if(GIT_FOUND) if(GIT_FOUND)
message("Git was found: ${GIT_EXECUTABLE}") message("Git was found: ${GIT_EXECUTABLE}")
# Adding the name of the git branch to the build name
EXEC_PROGRAM(git
ARGS branch --no-color 2> /dev/null | grep '*'| awk '{print $2}'
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
message("Git branch: ${GIT_BRANCH_NAME}")
SET(BUILDNAME "${BUILDNAME}-git-branch:${GIT_BRANCH_NAME}")
endif() endif()
# Some last minute cleanup
# Seems like no '/' are allowed in the BUILDNAME or in the SITE name
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
string(REPLACE "/" "_" SITE ${SITE})
# Build section # Build section
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------