Bugfix for the test harness: Martin Beaudoin

This commit is contained in:
Hrvoje Jasak 2018-05-15 10:48:37 +01:00
commit 7d9f975a8e
3 changed files with 28 additions and 22 deletions

View file

@ -1,7 +1,7 @@
# /*-------------------------------------------------------------------------*\
# ========= |
# \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | Version: 4.0
# \\ / O peration | Version: 4.1
# \\ / A nd | Web: http://www.foam-extend.org
# \\/ M anipulation | For copyright notice see file Copyright
# -----------------------------------------------------------------------------
@ -23,7 +23,7 @@
#
# Description
# CMakeLists.txt file for implementing a test harness for the compilation
# and test of foam-extend-3.2 using Kitware CTest/CMake/CDash
# and test of foam-extend-4.1 using Kitware CTest/CMake/CDash
#
# The results will be submitted to the CDash server identified by the file
# CTestConfig.cmake
@ -36,7 +36,7 @@
cmake_minimum_required (VERSION 2.8)
PROJECT(foam-extend-4.0)
PROJECT(foam-extend-4.1)
#-----------------------------------------------------------------------------
# Utility functions
@ -52,13 +52,16 @@ function(GetHostName var)
execute_process(
COMMAND hostname
OUTPUT_VARIABLE thisHostname
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else()
execute_process(
COMMAND hostname -f
OUTPUT_VARIABLE thisHostname
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
set(${var} ${thisHostname} PARENT_SCOPE)
endfunction()

View file

@ -1,7 +1,7 @@
# /*-------------------------------------------------------------------------*\
# ========= |
# \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | Version: 4.0
# \\ / O peration | Version: 4.1
# \\ / A nd | Web: http://www.foam-extend.org
# \\/ M anipulation | For copyright notice see file Copyright
# -----------------------------------------------------------------------------
@ -23,7 +23,7 @@
#
# Description
# CMakeLists.txt file for implementing a test harness for the compilation
# and test of foam-extend-4.0 using Kitware CTest/CMake/CDash
# and test of foam-extend-4.1 using Kitware CTest/CMake/CDash
#
# The results will be submitted to the CDash server identified by the file
# CTestConfig.cmake
@ -36,7 +36,7 @@
cmake_minimum_required (VERSION 2.8)
PROJECT(foam-extend-4.0)
PROJECT(foam-extend-4.1)
#-----------------------------------------------------------------------------
# Utility functions
@ -52,13 +52,16 @@ function(GetHostName var)
execute_process(
COMMAND hostname
OUTPUT_VARIABLE thisHostname
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else()
execute_process(
COMMAND hostname -f
OUTPUT_VARIABLE thisHostname
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
set(${var} ${thisHostname} PARENT_SCOPE)
endfunction()

View file

@ -10,12 +10,12 @@
# on the foam-extend CDash service hosted on SourceForge.Net
# See here: http://foam-extend.sourceforge.net/CDash/index.php
#
set(CTEST_PROJECT_NAME "foam-extend-4.0")
set(CTEST_PROJECT_NAME "foam-extend-4.1")
set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "foam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-4.0")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-4.1")
set(CTEST_DROP_SITE_CDASH TRUE)
# We can override those variables for local sites so you can use