Fixing testHarness

This commit is contained in:
Martin Beaudoin 2012-05-11 08:47:43 -07:00
parent 1455422a0a
commit 068bc78dbb
10 changed files with 45 additions and 42 deletions

View file

@ -24,7 +24,7 @@
# #
# Description # Description
# CMakeLists.txt file for implementing a test harness for the compilation # CMakeLists.txt file for implementing a test harness for the compilation
# and test of OpenFOAM-1.5-dev using Kitware CTest./CMake/CDash # and test of OpenFOAM-1.6-ext using Kitware CTest./CMake/CDash
# #
# The results will be submitted to the CDash server identified by the file # The results will be submitted to the CDash server identified by the file
# CTestConfig.cmake # CTestConfig.cmake
@ -37,7 +37,7 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
PROJECT(OpenFOAM_1.5-dev) PROJECT(OpenFOAM_1.6-ext)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Initialization of CTest specific variables # Initialization of CTest specific variables
@ -92,7 +92,7 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
# We will support more compilers eventually. # We will support more compilers eventually.
# #
# Timeout for running all this: 4 hours: 4 x 3600 seconds # Timeout for running every single test: 4 hours: 4 x 3600 seconds
#SET( #SET(
# 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."
@ -133,7 +133,7 @@ if(GIT_FOUND)
) )
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=${GIT_BRANCH_NAME}")
endif() endif()
# Some last minute cleanup # Some last minute cleanup

View file

@ -4,10 +4,10 @@
## # The following are required to uses Dart and the Cdash dashboard ## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING() ## ENABLE_TESTING()
## INCLUDE(CTest) ## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext_testing") set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http") set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net") set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext_testing") set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext")
set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_DROP_SITE_CDASH TRUE)

View file

@ -146,4 +146,13 @@
#setenv ParaView_VERSION git # eg, cvs/git version #setenv ParaView_VERSION git # eg, cvs/git version
#setenv ParaView_MAJOR 3.7 #setenv ParaView_MAJOR 3.7
# System identifier for the OpenFOAM CDash test harness on openfoam-extend
#
# By default, your system FQN/hostname will be used as the system identifier
# when publishing your test harness results on the OpenFOAM CDash server
# on openfoam-extend.
# You can override your identifier using this environment variable
#setenv CDASH_SUBMIT_LOCAL_HOST_ID choose_your_CDash_system_identifer
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View file

@ -156,4 +156,13 @@ compilerInstall=System
#export ParaView_VERSION=git # eg, cvs/git version #export ParaView_VERSION=git # eg, cvs/git version
#export ParaView_MAJOR=3.7 #export ParaView_MAJOR=3.7
# System identifier for the OpenFOAM CDash test harness on openfoam-extend
#
# By default, your system FQN/hostname will be used as the system identifier
# when publishing your test harness results on the OpenFOAM CDash server
# on openfoam-extend.
# You can override your identifier using this environment variable
#export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View file

@ -31,6 +31,7 @@
# \*---------------------------------------------------------------------------*/ # \*---------------------------------------------------------------------------*/
Warning #1: Make sure your OpenFOAM environment is properly initialized before Warning #1: Make sure your OpenFOAM environment is properly initialized before
running the test harness. running the test harness.

View file

@ -24,7 +24,7 @@
# #
# Description # Description
# CMakeLists.txt file for implementing a test harness for the compilation # CMakeLists.txt file for implementing a test harness for the compilation
# and test of OpenFOAM-1.5-dev using Kitware CTest./CMake/CDash # and test of OpenFOAM-1.6-ext using Kitware CTest./CMake/CDash
# #
# The results will be submitted to the CDash server identified by the file # The results will be submitted to the CDash server identified by the file
# CTestConfig.cmake # CTestConfig.cmake
@ -37,7 +37,7 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
PROJECT(OpenFOAM_1.5-dev) PROJECT(OpenFOAM_1.6-ext)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Initialization of CTest specific variables # Initialization of CTest specific variables
@ -92,7 +92,7 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
# We will support more compilers eventually. # We will support more compilers eventually.
# #
# Timeout for running all this: 4 hours: 4 x 3600 seconds # Timeout for running every single test: 4 hours: 4 x 3600 seconds
#SET( #SET(
# 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."
@ -125,7 +125,15 @@ if(GIT_FOUND)
OUTPUT_VARIABLE GIT_BRANCH_NAME OUTPUT_VARIABLE GIT_BRANCH_NAME
) )
message("Git branch: ${GIT_BRANCH_NAME}") message("Git branch: ${GIT_BRANCH_NAME}")
SET(BUILDNAME "${BUILDNAME}-git-branch:${GIT_BRANCH_NAME}") if (GIT_BRANCH_NAME STREQUAL "")
message("No git-branch. Mercurial?")
EXEC_PROGRAM(hg
ARGS branch
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif()
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
endif() endif()
# Some last minute cleanup # Some last minute cleanup

View file

@ -4,10 +4,10 @@
## # The following are required to uses Dart and the Cdash dashboard ## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING() ## ENABLE_TESTING()
## INCLUDE(CTest) ## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "OpenFOAM-1.5-dev") set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http") set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net") set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.5-dev") set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext")
set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_DROP_SITE_CDASH TRUE)

View file

@ -1,13 +0,0 @@
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext_testing")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext_testing")
set(CTEST_DROP_SITE_CDASH TRUE)

View file

@ -48,7 +48,7 @@ a) You can set your local system identifier using the environment variable
b) Install the CMakeLists.txt and CTestConfig.cmake files by executing the following commands: b) Install the CMakeLists.txt and CTestConfig.cmake files by executing the following commands:
cp ./CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR cp ./CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR
cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend_of-1.6-ext-testing $WM_PROJECT_DIR/CTestConfig.cmake cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake
c) Run the test harness and push your results on the CDash server on openfoam-extend c) Run the test harness and push your results on the CDash server on openfoam-extend
@ -74,5 +74,5 @@ To submit your results to the CDash server on openfoam-extend, just use
the file CTestConfig.cmake.openfoam-extend. the file CTestConfig.cmake.openfoam-extend.
If submitted to the CDash server on openfoam-extend, your results will be displayed here: If submitted to the CDash server on openfoam-extend, your results will be displayed here:
http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext_testing http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext

View file

@ -7,7 +7,7 @@ Directory Structure
=================== ===================
OpenFOAM : CMake/CTest scripts for compilation and execution test harness for OpenFOAM. OpenFOAM : CMake/CTest scripts for compilation and execution test harness for OpenFOAM.
OpenFOAM/1.6-dev : Test harness for OpenFOAM version 1.6-dev. See the file OpenFOAM/1.6-dev/README.txt for more information OpenFOAM/1.6-ext : Test harness for OpenFOAM version 1.6-ext. See the file OpenFOAM/1.6-ext/README.txt for more information
OSIG : CMake/CTest scripts for OpenFOAM Special Interest Group (OSIG) test harness OSIG : CMake/CTest scripts for OpenFOAM Special Interest Group (OSIG) test harness
OSIG/TurboMachinery : Test harness for the TurboMachinery OSIG. See the file OSIG/Turbomachinery/README.txt for more information. OSIG/TurboMachinery : Test harness for the TurboMachinery OSIG. See the file OSIG/Turbomachinery/README.txt for more information.
@ -42,7 +42,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
Still, I recommand always checking that these two important files are up-to-date: Still, I recommand always checking that these two important files are up-to-date:
cp ../CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR cp ../CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR
cp ../CMakeFiles/CTestConfig.cmake.openfoam-extend_of-1.6-ext-testing $WM_PROJECT_DIR/CTestConfig.cmake cp ../CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake
7: Next, running the test loop is pretty simple: 7: Next, running the test loop is pretty simple:
@ -55,9 +55,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
8: The results will be published on the CDash dashboard on openfoam-extend. 8: The results will be published on the CDash dashboard on openfoam-extend.
To see your results: To see your results:
URL : http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext_testing URL : http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext
Username : of-1.6-ext@of-extend.cdash
Password : onepasswd4all
9: You can customize your system identifier on the dashboard using the environment variable $CDASH_SUBMIT_LOCAL_HOST_ID. 9: You can customize your system identifier on the dashboard using the environment variable $CDASH_SUBMIT_LOCAL_HOST_ID.
@ -71,15 +69,6 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
10: In general, see the file $WM_PROJECT_DIR/testHarness/OpenFOAM/1.6-ext/README.txt for the necessary information about running the 10: In general, see the file $WM_PROJECT_DIR/testHarness/OpenFOAM/1.6-ext/README.txt for the necessary information about running the
test loop. test loop.
(NB: I just found out a couple of mistakes in that file, so please use this message for now as per instructions for running the test loop.
I will fix this shortly. Sorry.)
11: As more people will start using these basic steps, I will supply more information about some other features that are available with 11: Please do not hesitate to report any problems, comments, suggestions about the test loop.
the test loop.
But I need to see those baby steps first... :)
12: Please do not hesitate to report any problems, comments, suggestions about the test loop.
This stuff runs great on my systems, but it needs to run even better on yours.