testHarness: improved CTest coding. Adjustments for the Windows port.
This commit is contained in:
Martin Beaudoin
Hrvoje Jasak
parent
a2f96bf6f4
commit
209da85a76
3 changed files with 252 additions and 58 deletions
151
CMakeLists.txt
151
CMakeLists.txt
|
|
@ -39,6 +39,117 @@ cmake_minimum_required (VERSION 2.8)
|
||||||
PROJECT(foam-extend-3.2)
|
PROJECT(foam-extend-3.2)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
# Utility functions
|
||||||
|
#
|
||||||
|
# GetHostName(var)
|
||||||
|
#
|
||||||
|
# Set the variable named ${var} to the host hostname
|
||||||
|
#
|
||||||
|
function(GetHostName var)
|
||||||
|
set( thisHostName "unknown")
|
||||||
|
|
||||||
|
if(CMAKE_HOST_WIN32)
|
||||||
|
execute_process(
|
||||||
|
COMMAND hostname
|
||||||
|
OUTPUT_VARIABLE thisHostname
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
execute_process(
|
||||||
|
COMMAND hostname -f
|
||||||
|
OUTPUT_VARIABLE thisHostname
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
set(${var} ${thisHostname} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#
|
||||||
|
# GetGitStatus(status ecode)
|
||||||
|
#
|
||||||
|
# Get the git status for the local git repository of the source code
|
||||||
|
# The variable named ${status} will get the git status
|
||||||
|
# The variable named ${ecode} will get the command error code
|
||||||
|
#
|
||||||
|
function(GetGitStatus _status _ecode)
|
||||||
|
set( git_status "unknown")
|
||||||
|
set( git_ecode "1")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git status
|
||||||
|
WORKING_DIRECTORY ${FOAM_ROOT}
|
||||||
|
OUTPUT_VARIABLE git_status
|
||||||
|
RESULT_VARIABLE git_ecode
|
||||||
|
ERROR_QUIET
|
||||||
|
)
|
||||||
|
set(${_status} ${git_status} PARENT_SCOPE)
|
||||||
|
set(${_ecode} ${git_ecode} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#
|
||||||
|
# GetGitBranchName(var)
|
||||||
|
#
|
||||||
|
# Set the variable named ${var} to the git branch name of the source code
|
||||||
|
#
|
||||||
|
function(GetGitBranchName var)
|
||||||
|
set( retValue "unknown")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git branch --no-color
|
||||||
|
WORKING_DIRECTORY ${FOAM_ROOT}
|
||||||
|
OUTPUT_VARIABLE listOfGitBranches
|
||||||
|
)
|
||||||
|
# Create list of strings
|
||||||
|
string(REPLACE "\n" ";" listOfGitBranches ${listOfGitBranches})
|
||||||
|
|
||||||
|
# Iterate over list, find the string beginning with "* "
|
||||||
|
foreach(branch ${listOfGitBranches})
|
||||||
|
string(REGEX MATCH "\\* .*$" matchString ${branch})
|
||||||
|
string(LENGTH "${matchString}" lengthMatchString)
|
||||||
|
if(lengthMatchString GREATER 0)
|
||||||
|
# We have match. Cleanup and set retValue
|
||||||
|
string(REPLACE "* " "" retValue ${matchString})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set(${var} ${retValue} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#
|
||||||
|
# GetGitRevNumber(var)
|
||||||
|
#
|
||||||
|
# Set the variable named ${var} to the git revision number of the source code
|
||||||
|
#
|
||||||
|
function(GetGitRevNumber var)
|
||||||
|
set( retValue "unknown")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git rev-parse --short=12 HEAD
|
||||||
|
WORKING_DIRECTORY ${FOAM_ROOT}
|
||||||
|
OUTPUT_VARIABLE git_rev_number
|
||||||
|
)
|
||||||
|
|
||||||
|
# Minimal check that we do have a valid string
|
||||||
|
string(LENGTH "${git_rev_number}" lengthString)
|
||||||
|
if(lengthString GREATER 0)
|
||||||
|
set(retValue ${git_rev_number})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(${var} ${retValue} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
# CleanUpStringForCDash(var)
|
||||||
|
#
|
||||||
|
# Cleanup the variable named ${value} for characters not supported
|
||||||
|
# for CDash identifiers. Return the modified value in retVar
|
||||||
|
#
|
||||||
|
function(CleanUpStringForCDash value retVar)
|
||||||
|
string(REPLACE "/" "_" value "${value}")
|
||||||
|
string(REPLACE " " "_" value ${value})
|
||||||
|
set(${retVar} ${value} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
#
|
||||||
# Initialization of CTest specific variables
|
# Initialization of CTest specific variables
|
||||||
#
|
#
|
||||||
## Run ctest in parallel if environment variable WM_NCOMPPROCS is set
|
## Run ctest in parallel if environment variable WM_NCOMPPROCS is set
|
||||||
|
|
@ -57,13 +168,11 @@ IF (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
|
||||||
SITENAME $ENV{CDASH_SUBMIT_LOCAL_HOST_ID}
|
SITENAME $ENV{CDASH_SUBMIT_LOCAL_HOST_ID}
|
||||||
CACHE STRING "Name of the local site"
|
CACHE STRING "Name of the local site"
|
||||||
)
|
)
|
||||||
ELSE (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
|
ELSE ()
|
||||||
# Grab the hostname FQN; will be used for the sitename
|
# Grab the hostname FQN; will be used for the sitename
|
||||||
execute_process(
|
GetHostName(SITENAME)
|
||||||
COMMAND hostname -f
|
|
||||||
OUTPUT_VARIABLE SITENAME
|
ENDIF()
|
||||||
)
|
|
||||||
ENDIF (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
|
|
||||||
|
|
||||||
MESSAGE("Initializing the name of this local site to: ${SITENAME}")
|
MESSAGE("Initializing the name of this local site to: ${SITENAME}")
|
||||||
|
|
||||||
|
|
@ -146,27 +255,15 @@ elseif(GIT_FOUND)
|
||||||
message("The git command was found: ${GIT_EXECUTABLE}")
|
message("The git command was found: ${GIT_EXECUTABLE}")
|
||||||
|
|
||||||
# Check if the source code is under a valid git repository
|
# Check if the source code is under a valid git repository
|
||||||
execute_process(
|
GetGitStatus(GIT_STATUS GIT_ECODE)
|
||||||
COMMAND git status
|
|
||||||
WORKING_DIRECTORY ${FOAM_ROOT}
|
|
||||||
OUTPUT_VARIABLE GIT_STATUS
|
|
||||||
RESULT_VARIABLE GIT_ECODE
|
|
||||||
ERROR_QUIET
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT GIT_ECODE)
|
if(NOT GIT_ECODE)
|
||||||
# We have a valid git repository. Grab the branch and revision info.
|
# We have a valid git repository.
|
||||||
# Add to the build name
|
# Grab the branch and revision info. Add to the build name
|
||||||
exec_program(git
|
GetGitBranchName(GIT_BRANCH_NAME)
|
||||||
ARGS branch --no-color 2> /dev/null | grep '*'| awk '{print $2}'
|
|
||||||
OUTPUT_VARIABLE GIT_BRANCH_NAME
|
|
||||||
)
|
|
||||||
message("Git branch: ${GIT_BRANCH_NAME}")
|
message("Git branch: ${GIT_BRANCH_NAME}")
|
||||||
|
|
||||||
execute_process(
|
GetGitRevNumber(GIT_REV_NUMBER)
|
||||||
COMMAND git rev-parse --short=12 HEAD
|
|
||||||
OUTPUT_VARIABLE GIT_REV_NUMBER
|
|
||||||
)
|
|
||||||
message("Git revision: ${GIT_REV_NUMBER}")
|
message("Git revision: ${GIT_REV_NUMBER}")
|
||||||
|
|
||||||
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
|
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
|
||||||
|
|
@ -216,13 +313,13 @@ endif()
|
||||||
|
|
||||||
# Some last minute cleanup
|
# Some last minute cleanup
|
||||||
# Seems like no '/' or ' 'are allowed in the BUILDNAME or in the SITE name
|
# Seems like no '/' or ' 'are allowed in the BUILDNAME or in the SITE name
|
||||||
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
|
CleanUpStringForCDash(${BUILDNAME} BUILDNAME)
|
||||||
string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
|
CleanUpStringForCDash(${SITE} SITE)
|
||||||
string(REPLACE "/" "_" SITE ${SITE})
|
|
||||||
string(REPLACE " " "_" SITE ${SITE})
|
|
||||||
|
|
||||||
message("Build name: ${BUILDNAME}")
|
message("Build name: ${BUILDNAME}")
|
||||||
|
message("Site name: ${SITE}")
|
||||||
|
|
||||||
|
#
|
||||||
# Build section
|
# Build section
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,117 @@ cmake_minimum_required (VERSION 2.8)
|
||||||
PROJECT(foam-extend-3.2)
|
PROJECT(foam-extend-3.2)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
# Utility functions
|
||||||
|
#
|
||||||
|
# GetHostName(var)
|
||||||
|
#
|
||||||
|
# Set the variable named ${var} to the host hostname
|
||||||
|
#
|
||||||
|
function(GetHostName var)
|
||||||
|
set( thisHostName "unknown")
|
||||||
|
|
||||||
|
if(CMAKE_HOST_WIN32)
|
||||||
|
execute_process(
|
||||||
|
COMMAND hostname
|
||||||
|
OUTPUT_VARIABLE thisHostname
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
execute_process(
|
||||||
|
COMMAND hostname -f
|
||||||
|
OUTPUT_VARIABLE thisHostname
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
set(${var} ${thisHostname} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#
|
||||||
|
# GetGitStatus(status ecode)
|
||||||
|
#
|
||||||
|
# Get the git status for the local git repository of the source code
|
||||||
|
# The variable named ${status} will get the git status
|
||||||
|
# The variable named ${ecode} will get the command error code
|
||||||
|
#
|
||||||
|
function(GetGitStatus _status _ecode)
|
||||||
|
set( git_status "unknown")
|
||||||
|
set( git_ecode "1")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git status
|
||||||
|
WORKING_DIRECTORY ${FOAM_ROOT}
|
||||||
|
OUTPUT_VARIABLE git_status
|
||||||
|
RESULT_VARIABLE git_ecode
|
||||||
|
ERROR_QUIET
|
||||||
|
)
|
||||||
|
set(${_status} ${git_status} PARENT_SCOPE)
|
||||||
|
set(${_ecode} ${git_ecode} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#
|
||||||
|
# GetGitBranchName(var)
|
||||||
|
#
|
||||||
|
# Set the variable named ${var} to the git branch name of the source code
|
||||||
|
#
|
||||||
|
function(GetGitBranchName var)
|
||||||
|
set( retValue "unknown")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git branch --no-color
|
||||||
|
WORKING_DIRECTORY ${FOAM_ROOT}
|
||||||
|
OUTPUT_VARIABLE listOfGitBranches
|
||||||
|
)
|
||||||
|
# Create list of strings
|
||||||
|
string(REPLACE "\n" ";" listOfGitBranches ${listOfGitBranches})
|
||||||
|
|
||||||
|
# Iterate over list, find the string beginning with "* "
|
||||||
|
foreach(branch ${listOfGitBranches})
|
||||||
|
string(REGEX MATCH "\\* .*$" matchString ${branch})
|
||||||
|
string(LENGTH "${matchString}" lengthMatchString)
|
||||||
|
if(lengthMatchString GREATER 0)
|
||||||
|
# We have match. Cleanup and set retValue
|
||||||
|
string(REPLACE "* " "" retValue ${matchString})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set(${var} ${retValue} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#
|
||||||
|
# GetGitRevNumber(var)
|
||||||
|
#
|
||||||
|
# Set the variable named ${var} to the git revision number of the source code
|
||||||
|
#
|
||||||
|
function(GetGitRevNumber var)
|
||||||
|
set( retValue "unknown")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git rev-parse --short=12 HEAD
|
||||||
|
WORKING_DIRECTORY ${FOAM_ROOT}
|
||||||
|
OUTPUT_VARIABLE git_rev_number
|
||||||
|
)
|
||||||
|
|
||||||
|
# Minimal check that we do have a valid string
|
||||||
|
string(LENGTH "${git_rev_number}" lengthString)
|
||||||
|
if(lengthString GREATER 0)
|
||||||
|
set(retValue ${git_rev_number})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(${var} ${retValue} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
# CleanUpStringForCDash(var)
|
||||||
|
#
|
||||||
|
# Cleanup the variable named ${value} for characters not supported
|
||||||
|
# for CDash identifiers. Return the modified value in retVar
|
||||||
|
#
|
||||||
|
function(CleanUpStringForCDash value retVar)
|
||||||
|
string(REPLACE "/" "_" value "${value}")
|
||||||
|
string(REPLACE " " "_" value ${value})
|
||||||
|
set(${retVar} ${value} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
#
|
||||||
# Initialization of CTest specific variables
|
# Initialization of CTest specific variables
|
||||||
#
|
#
|
||||||
## Run ctest in parallel if environment variable WM_NCOMPPROCS is set
|
## Run ctest in parallel if environment variable WM_NCOMPPROCS is set
|
||||||
|
|
@ -57,13 +168,11 @@ IF (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
|
||||||
SITENAME $ENV{CDASH_SUBMIT_LOCAL_HOST_ID}
|
SITENAME $ENV{CDASH_SUBMIT_LOCAL_HOST_ID}
|
||||||
CACHE STRING "Name of the local site"
|
CACHE STRING "Name of the local site"
|
||||||
)
|
)
|
||||||
ELSE (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
|
ELSE ()
|
||||||
# Grab the hostname FQN; will be used for the sitename
|
# Grab the hostname FQN; will be used for the sitename
|
||||||
execute_process(
|
GetHostName(SITENAME)
|
||||||
COMMAND hostname -f
|
|
||||||
OUTPUT_VARIABLE SITENAME
|
ENDIF()
|
||||||
)
|
|
||||||
ENDIF (NOT $ENV{CDASH_SUBMIT_LOCAL_HOST_ID} STREQUAL "")
|
|
||||||
|
|
||||||
MESSAGE("Initializing the name of this local site to: ${SITENAME}")
|
MESSAGE("Initializing the name of this local site to: ${SITENAME}")
|
||||||
|
|
||||||
|
|
@ -146,27 +255,15 @@ elseif(GIT_FOUND)
|
||||||
message("The git command was found: ${GIT_EXECUTABLE}")
|
message("The git command was found: ${GIT_EXECUTABLE}")
|
||||||
|
|
||||||
# Check if the source code is under a valid git repository
|
# Check if the source code is under a valid git repository
|
||||||
execute_process(
|
GetGitStatus(GIT_STATUS GIT_ECODE)
|
||||||
COMMAND git status
|
|
||||||
WORKING_DIRECTORY ${FOAM_ROOT}
|
|
||||||
OUTPUT_VARIABLE GIT_STATUS
|
|
||||||
RESULT_VARIABLE GIT_ECODE
|
|
||||||
ERROR_QUIET
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT GIT_ECODE)
|
if(NOT GIT_ECODE)
|
||||||
# We have a valid git repository. Grab the branch and revision info.
|
# We have a valid git repository.
|
||||||
# Add to the build name
|
# Grab the branch and revision info. Add to the build name
|
||||||
exec_program(git
|
GetGitBranchName(GIT_BRANCH_NAME)
|
||||||
ARGS branch --no-color 2> /dev/null | grep '*'| awk '{print $2}'
|
|
||||||
OUTPUT_VARIABLE GIT_BRANCH_NAME
|
|
||||||
)
|
|
||||||
message("Git branch: ${GIT_BRANCH_NAME}")
|
message("Git branch: ${GIT_BRANCH_NAME}")
|
||||||
|
|
||||||
execute_process(
|
GetGitRevNumber(GIT_REV_NUMBER)
|
||||||
COMMAND git rev-parse --short=12 HEAD
|
|
||||||
OUTPUT_VARIABLE GIT_REV_NUMBER
|
|
||||||
)
|
|
||||||
message("Git revision: ${GIT_REV_NUMBER}")
|
message("Git revision: ${GIT_REV_NUMBER}")
|
||||||
|
|
||||||
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
|
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
|
||||||
|
|
@ -216,13 +313,13 @@ endif()
|
||||||
|
|
||||||
# Some last minute cleanup
|
# Some last minute cleanup
|
||||||
# Seems like no '/' or ' 'are allowed in the BUILDNAME or in the SITE name
|
# Seems like no '/' or ' 'are allowed in the BUILDNAME or in the SITE name
|
||||||
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
|
CleanUpStringForCDash(${BUILDNAME} BUILDNAME)
|
||||||
string(REPLACE " " "_" BUILDNAME ${BUILDNAME})
|
CleanUpStringForCDash(${SITE} SITE)
|
||||||
string(REPLACE "/" "_" SITE ${SITE})
|
|
||||||
string(REPLACE " " "_" SITE ${SITE})
|
|
||||||
|
|
||||||
message("Build name: ${BUILDNAME}")
|
message("Build name: ${BUILDNAME}")
|
||||||
|
message("Site name: ${SITE}")
|
||||||
|
|
||||||
|
#
|
||||||
# Build section
|
# Build section
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,14 +90,14 @@ FOREACH(caseWithAllrun ${listofCasesWithAllrun})
|
||||||
MESSAGE("Found Allrun file in directory: ${thisCasePath}")
|
MESSAGE("Found Allrun file in directory: ${thisCasePath}")
|
||||||
|
|
||||||
# Grab the parent name of the case directory
|
# Grab the parent name of the case directory
|
||||||
string(REPLACE ${TEST_CASE_DIR}/ "" caseParentPath ${caseWithAllrun})
|
string(REPLACE ${TEST_CASE_DIR}/ "" caseParentPath ${thisCasePath})
|
||||||
|
|
||||||
# Construct the testId
|
# Construct the testId
|
||||||
string(REPLACE "/" "_" testId ${caseParentPath})
|
string(REPLACE "/" "_" testId ${caseParentPath})
|
||||||
SET(testId ${testId}${testIdSuffix})
|
SET(testId ${testId}_Allrun${testIdSuffix})
|
||||||
|
|
||||||
# Add the test to the test harness
|
# Add the test to the test harness
|
||||||
MESSAGE("Adding test: ${testId}")
|
MESSAGE(" Adding test: ${testId}")
|
||||||
ADD_TEST(${testId} bash -c "cd ${thisCasePath}; ./Allrun")
|
ADD_TEST(${testId} bash -c "cd ${thisCasePath}; ./Allrun")
|
||||||
|
|
||||||
# We extract a label name from the top level tutorial directories
|
# We extract a label name from the top level tutorial directories
|
||||||
|
|
@ -120,7 +120,7 @@ FOREACH(caseWithAllrun ${listofCasesWithAllrun})
|
||||||
# Use this following entry instead for testing purpose
|
# Use this following entry instead for testing purpose
|
||||||
#ADD_TEST(${testId} bash -c "cd ${thisCasePath}; true")
|
#ADD_TEST(${testId} bash -c "cd ${thisCasePath}; true")
|
||||||
|
|
||||||
ENDIF(NOT ${thisCasePath} STREQUAL ${TEST_CASE_DIR})
|
ENDIF()
|
||||||
ENDFOREACH(caseWithAllrun)
|
ENDFOREACH(caseWithAllrun)
|
||||||
|
|
||||||
# Modify the cases Allrun files to incorporate additional shell functions
|
# Modify the cases Allrun files to incorporate additional shell functions
|
||||||
|
|
|
||||||
Reference in a new issue