From e7d09787c866a26f5fac9f092b01ca779dc9a083 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Wed, 17 Jun 2015 23:00:45 -0400 Subject: [PATCH] testHarness: various adjustments for foam-extend 3.2. The results will now be reported on the foam-extend project CDash service on SourceForge.net --- CMakeLists.txt | 4 ++-- CTestConfig.cmake | 12 +++++++----- testHarness/README.txt | 10 +++++----- .../{3.1 => 3.2}/CMakeFiles/CMakeLists.txt | 10 +++++----- .../CMakeFiles/CTestConfig.cmake.foam-extend} | 12 +++++++----- .../{3.1 => 3.2}/CMakeFiles/FOAM_Tutorials.cmake | 0 testHarness/foam-extend/{3.1 => 3.2}/README.txt | 12 ++++++------ testHarness/foam-extend/{3.1 => 3.2}/runDir/Allclean | 0 .../foam-extend/{3.1 => 3.2}/runDir/Allrun_CMakeOnly | 0 .../{3.1 => 3.2}/runDir/Allrun_Experimental | 0 .../foam-extend/{3.1 => 3.2}/runDir/Allrun_Nightly | 0 .../{3.1 => 3.2}/scripts/AdditionalRunFunctions | 0 .../{3.1 => 3.2}/scripts/AdditionalRunFunctions.old | 0 .../foam-extend/{3.1 => 3.2}/scripts/Allrun.default | 0 .../scripts/addMissingAllrunFileToTutorial.sh | 0 .../scripts/prepareCasesForOneTimeStep.sh | 0 .../scripts/prepareCasesForTestHarness.sh | 0 17 files changed, 32 insertions(+), 28 deletions(-) rename testHarness/foam-extend/{3.1 => 3.2}/CMakeFiles/CMakeLists.txt (96%) rename testHarness/foam-extend/{3.1/CMakeFiles/CTestConfig.cmake.openfoam-extend => 3.2/CMakeFiles/CTestConfig.cmake.foam-extend} (62%) rename testHarness/foam-extend/{3.1 => 3.2}/CMakeFiles/FOAM_Tutorials.cmake (100%) rename testHarness/foam-extend/{3.1 => 3.2}/README.txt (87%) rename testHarness/foam-extend/{3.1 => 3.2}/runDir/Allclean (100%) rename testHarness/foam-extend/{3.1 => 3.2}/runDir/Allrun_CMakeOnly (100%) rename testHarness/foam-extend/{3.1 => 3.2}/runDir/Allrun_Experimental (100%) rename testHarness/foam-extend/{3.1 => 3.2}/runDir/Allrun_Nightly (100%) rename testHarness/foam-extend/{3.1 => 3.2}/scripts/AdditionalRunFunctions (100%) rename testHarness/foam-extend/{3.1 => 3.2}/scripts/AdditionalRunFunctions.old (100%) rename testHarness/foam-extend/{3.1 => 3.2}/scripts/Allrun.default (100%) rename testHarness/foam-extend/{3.1 => 3.2}/scripts/addMissingAllrunFileToTutorial.sh (100%) rename testHarness/foam-extend/{3.1 => 3.2}/scripts/prepareCasesForOneTimeStep.sh (100%) rename testHarness/foam-extend/{3.1 => 3.2}/scripts/prepareCasesForTestHarness.sh (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 563927368..5f0aaa327 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ # # Description # CMakeLists.txt file for implementing a test harness for the compilation -# and test of foam-extend-3.1 using Kitware CTest./CMake/CDash +# and test of foam-extend-3.2 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-3.1) +PROJECT(foam-extend-3.2) #----------------------------------------------------------------------------- # Initialization of CTest specific variables diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 7dda0fc34..1190369a2 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -1,13 +1,15 @@ ## 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 +## +## # The following are required to submit to the CDash dashboard: ## ENABLE_TESTING() ## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "foam-extend-3.1") -set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") + +set(CTEST_PROJECT_NAME "foam-extend-3.2") +set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC") set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.1") +set(CTEST_DROP_SITE "foam-extend.sourceforge.net") +set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.2") set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/testHarness/README.txt b/testHarness/README.txt index 57b319a20..325b849f6 100644 --- a/testHarness/README.txt +++ b/testHarness/README.txt @@ -6,7 +6,7 @@ This part of the repository is for FOAM test harnesses. Directory Structure =================== -foam-extend-3.1 : Test harness for foam-extend version 3.1. See the file foam-extend-3.1/README.txt for more information +foam-extend-3.2 : Test harness for foam-extend version 3.2. See the file foam-extend-3.2/README.txt for more information OSIG : CMake/CTest scripts for FOAM Special Interest Group (OSIG) test harness OSIG/TurboMachinery : Test harness for the TurboMachinery OSIG. See the file OSIG/Turbomachinery/README.txt for more information. @@ -34,7 +34,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. 5: move to the runDir directory for the FOAM test harness - cd $WM_PROJECT_DIR/testHarness/foam-extend/3.1/runDir + cd $WM_PROJECT_DIR/testHarness/foam-extend/3.2/runDir 6: Normally, if using the master branch, everything should already be setup for you to run the test harness. @@ -46,7 +46,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. 7: Next, running the test loop is pretty simple: - cd $WM_PROJECT_DIR/testHarness/foam-extend/3.1/runDir # you should already be there... + cd $WM_PROJECT_DIR/testHarness/foam-extend/3.2/runDir # you should already be there... ./Allclean ./Allrun_Experimental @@ -54,7 +54,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. 8: The results will be published on the CDash dashboard on openfoam-extend. To see your results: - URL : http://openfoam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.1 + URL : http://foam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.2 9: You can customize your system identifier on the dashboard using the environment variable $CDASH_SUBMIT_LOCAL_HOST_ID. @@ -66,7 +66,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. NB: Please no "forward slash" or "/" in the system ID; it looks like CDash will choke on this. -10: In general, see the file $WM_PROJECT_DIR/testHarness/foam-extend/3.1/README.txt for the necessary information about running the +10: In general, see the file $WM_PROJECT_DIR/testHarness/foam-extend/3.2/README.txt for the necessary information about running the test loop. diff --git a/testHarness/foam-extend/3.1/CMakeFiles/CMakeLists.txt b/testHarness/foam-extend/3.2/CMakeFiles/CMakeLists.txt similarity index 96% rename from testHarness/foam-extend/3.1/CMakeFiles/CMakeLists.txt rename to testHarness/foam-extend/3.2/CMakeFiles/CMakeLists.txt index 019caf65c..5f0aaa327 100644 --- a/testHarness/foam-extend/3.1/CMakeFiles/CMakeLists.txt +++ b/testHarness/foam-extend/3.2/CMakeFiles/CMakeLists.txt @@ -1,9 +1,9 @@ # /*-------------------------------------------------------------------------*\ # ========= | # \\ / F ield | foam-extend: Open Source CFD -# \\ / O peration | -# \\ / A nd | For copyright notice see file Copyright -# \\/ M anipulation | +# \\ / O peration | Version: 3.2 +# \\ / A nd | Web: http://www.foam-extend.org +# \\/ M anipulation | For copyright notice see file Copyright # ----------------------------------------------------------------------------- # License # This file is part of foam-extend. @@ -23,7 +23,7 @@ # # Description # CMakeLists.txt file for implementing a test harness for the compilation -# and test of foam-extend-3.1 using Kitware CTest./CMake/CDash +# and test of foam-extend-3.2 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-3.1) +PROJECT(foam-extend-3.2) #----------------------------------------------------------------------------- # Initialization of CTest specific variables diff --git a/testHarness/foam-extend/3.1/CMakeFiles/CTestConfig.cmake.openfoam-extend b/testHarness/foam-extend/3.2/CMakeFiles/CTestConfig.cmake.foam-extend similarity index 62% rename from testHarness/foam-extend/3.1/CMakeFiles/CTestConfig.cmake.openfoam-extend rename to testHarness/foam-extend/3.2/CMakeFiles/CTestConfig.cmake.foam-extend index 7dda0fc34..1190369a2 100644 --- a/testHarness/foam-extend/3.1/CMakeFiles/CTestConfig.cmake.openfoam-extend +++ b/testHarness/foam-extend/3.2/CMakeFiles/CTestConfig.cmake.foam-extend @@ -1,13 +1,15 @@ ## 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 +## +## # The following are required to submit to the CDash dashboard: ## ENABLE_TESTING() ## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "foam-extend-3.1") -set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") + +set(CTEST_PROJECT_NAME "foam-extend-3.2") +set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC") set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.1") +set(CTEST_DROP_SITE "foam-extend.sourceforge.net") +set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.2") set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/testHarness/foam-extend/3.1/CMakeFiles/FOAM_Tutorials.cmake b/testHarness/foam-extend/3.2/CMakeFiles/FOAM_Tutorials.cmake similarity index 100% rename from testHarness/foam-extend/3.1/CMakeFiles/FOAM_Tutorials.cmake rename to testHarness/foam-extend/3.2/CMakeFiles/FOAM_Tutorials.cmake diff --git a/testHarness/foam-extend/3.1/README.txt b/testHarness/foam-extend/3.2/README.txt similarity index 87% rename from testHarness/foam-extend/3.1/README.txt rename to testHarness/foam-extend/3.2/README.txt index 19143c4d2..dbc5e24f2 100644 --- a/testHarness/foam-extend/3.1/README.txt +++ b/testHarness/foam-extend/3.2/README.txt @@ -48,10 +48,10 @@ 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: cp ./CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR -cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake +cp ./CMakeFiles/CTestConfig.cmake.foam-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 foam-extend cd ./runDir; ./Allclean; ./Allrun_Experimental or @@ -70,9 +70,9 @@ Both Allrun_Experimental and Allrun_Nightly scripts will submit their results to the CDash server of your choice, as specified by the file $WM_PROJECT_DIR/CTestConfig.cmake. -To submit your results to the CDash server on openfoam-extend, just use -the file CTestConfig.cmake.openfoam-extend. +To submit your results to the CDash server on foam-extend, just use +the file CTestConfig.cmake.foam-extend. -If submitted to the CDash server on openfoam-extend, your results will be displayed here: -http://openfoam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.1 +If submitted to the CDash server on foam-extend, your results will be displayed here: +http://foam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.2 diff --git a/testHarness/foam-extend/3.1/runDir/Allclean b/testHarness/foam-extend/3.2/runDir/Allclean similarity index 100% rename from testHarness/foam-extend/3.1/runDir/Allclean rename to testHarness/foam-extend/3.2/runDir/Allclean diff --git a/testHarness/foam-extend/3.1/runDir/Allrun_CMakeOnly b/testHarness/foam-extend/3.2/runDir/Allrun_CMakeOnly similarity index 100% rename from testHarness/foam-extend/3.1/runDir/Allrun_CMakeOnly rename to testHarness/foam-extend/3.2/runDir/Allrun_CMakeOnly diff --git a/testHarness/foam-extend/3.1/runDir/Allrun_Experimental b/testHarness/foam-extend/3.2/runDir/Allrun_Experimental similarity index 100% rename from testHarness/foam-extend/3.1/runDir/Allrun_Experimental rename to testHarness/foam-extend/3.2/runDir/Allrun_Experimental diff --git a/testHarness/foam-extend/3.1/runDir/Allrun_Nightly b/testHarness/foam-extend/3.2/runDir/Allrun_Nightly similarity index 100% rename from testHarness/foam-extend/3.1/runDir/Allrun_Nightly rename to testHarness/foam-extend/3.2/runDir/Allrun_Nightly diff --git a/testHarness/foam-extend/3.1/scripts/AdditionalRunFunctions b/testHarness/foam-extend/3.2/scripts/AdditionalRunFunctions similarity index 100% rename from testHarness/foam-extend/3.1/scripts/AdditionalRunFunctions rename to testHarness/foam-extend/3.2/scripts/AdditionalRunFunctions diff --git a/testHarness/foam-extend/3.1/scripts/AdditionalRunFunctions.old b/testHarness/foam-extend/3.2/scripts/AdditionalRunFunctions.old similarity index 100% rename from testHarness/foam-extend/3.1/scripts/AdditionalRunFunctions.old rename to testHarness/foam-extend/3.2/scripts/AdditionalRunFunctions.old diff --git a/testHarness/foam-extend/3.1/scripts/Allrun.default b/testHarness/foam-extend/3.2/scripts/Allrun.default similarity index 100% rename from testHarness/foam-extend/3.1/scripts/Allrun.default rename to testHarness/foam-extend/3.2/scripts/Allrun.default diff --git a/testHarness/foam-extend/3.1/scripts/addMissingAllrunFileToTutorial.sh b/testHarness/foam-extend/3.2/scripts/addMissingAllrunFileToTutorial.sh similarity index 100% rename from testHarness/foam-extend/3.1/scripts/addMissingAllrunFileToTutorial.sh rename to testHarness/foam-extend/3.2/scripts/addMissingAllrunFileToTutorial.sh diff --git a/testHarness/foam-extend/3.1/scripts/prepareCasesForOneTimeStep.sh b/testHarness/foam-extend/3.2/scripts/prepareCasesForOneTimeStep.sh similarity index 100% rename from testHarness/foam-extend/3.1/scripts/prepareCasesForOneTimeStep.sh rename to testHarness/foam-extend/3.2/scripts/prepareCasesForOneTimeStep.sh diff --git a/testHarness/foam-extend/3.1/scripts/prepareCasesForTestHarness.sh b/testHarness/foam-extend/3.2/scripts/prepareCasesForTestHarness.sh similarity index 100% rename from testHarness/foam-extend/3.1/scripts/prepareCasesForTestHarness.sh rename to testHarness/foam-extend/3.2/scripts/prepareCasesForTestHarness.sh