From 45fc0403b3f1ecddc1d56f1d3769b9098af948b0 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Mon, 16 Dec 2013 14:35:43 +0000 Subject: [PATCH] Initial update of test harness. --- testHarness/OSIG/Turbomachinery/README.txt | 16 ++++------- .../Turbomachinery/runDir/Allrun_CMakeOnly | 4 +-- .../Turbomachinery/runDir/Allrun_Experimental | 4 +-- .../OSIG/Turbomachinery/runDir/Allrun_Nightly | 10 +++---- testHarness/README.txt | 20 ++++++------- .../3.0}/CMakeFiles/CMakeLists.txt | 28 +++++++++---------- .../CTestConfig.cmake.openfoam-extend | 4 +-- .../3.0/CMakeFiles/FOAM_Tutorials.cmake} | 10 +++---- .../1.6-ext => foam-extend/3.0}/README.txt | 15 +++++----- .../3.0}/runDir/Allclean | 0 .../3.0}/runDir/Allrun_CMakeOnly | 6 ++-- .../3.0}/runDir/Allrun_Experimental | 6 ++-- .../3.0}/runDir/Allrun_Nightly | 6 ++-- .../3.0}/scripts/AdditionalRunFunctions | 0 .../3.0}/scripts/AdditionalRunFunctions.old | 0 .../3.0}/scripts/Allrun.default | 0 .../scripts/addMissingAllrunFileToTutorial.sh | 0 .../scripts/prepareCasesForOneTimeStep.sh | 0 .../scripts/prepareCasesForTestHarness.sh | 0 19 files changed, 62 insertions(+), 67 deletions(-) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/CMakeFiles/CMakeLists.txt (89%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/CMakeFiles/CTestConfig.cmake.openfoam-extend (80%) rename testHarness/{OpenFOAM/1.6-ext/CMakeFiles/OpenFOAM_Tutorials.cmake => foam-extend/3.0/CMakeFiles/FOAM_Tutorials.cmake} (96%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/README.txt (88%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/runDir/Allclean (100%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/runDir/Allrun_CMakeOnly (92%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/runDir/Allrun_Experimental (92%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/runDir/Allrun_Nightly (92%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/scripts/AdditionalRunFunctions (100%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/scripts/AdditionalRunFunctions.old (100%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/scripts/Allrun.default (100%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/scripts/addMissingAllrunFileToTutorial.sh (100%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/scripts/prepareCasesForOneTimeStep.sh (100%) rename testHarness/{OpenFOAM/1.6-ext => foam-extend/3.0}/scripts/prepareCasesForTestHarness.sh (100%) diff --git a/testHarness/OSIG/Turbomachinery/README.txt b/testHarness/OSIG/Turbomachinery/README.txt index d31f2f48c..89887dc4a 100644 --- a/testHarness/OSIG/Turbomachinery/README.txt +++ b/testHarness/OSIG/Turbomachinery/README.txt @@ -1,10 +1,10 @@ -# /*---------------------------------------------------------------------------*\ +# /*-------------------------------------------------------------------------*\ # ========= | # \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | # \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | -# ------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # License # This file is part of foam-extend. # @@ -27,17 +27,11 @@ # # Author: # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. -# \*---------------------------------------------------------------------------*/ +# +# \*-------------------------------------------------------------------------*/ - - -MAJOR WARNING: THIS TEST HARNESS IS NOT READY YET FOR OPENFOAM-1.6-EXT ----------------------------------------------------------------------- - - - -Warning #1: Make sure your OpenFOAM environment is properly initialized before +Warning #1: Make sure your FOAM environment is properly initialized before running the test harness. Warning #2: Make sure to create an environment variable called $BREEDER_15_DIR diff --git a/testHarness/OSIG/Turbomachinery/runDir/Allrun_CMakeOnly b/testHarness/OSIG/Turbomachinery/runDir/Allrun_CMakeOnly index 4a326a133..6ac6385d3 100755 --- a/testHarness/OSIG/Turbomachinery/runDir/Allrun_CMakeOnly +++ b/testHarness/OSIG/Turbomachinery/runDir/Allrun_CMakeOnly @@ -23,7 +23,7 @@ # along with foam-extend. If not, see . # # Description -# Allrun file for running the OpenFOAM Turbomachinery OSIG test harness +# Allrun file for running the FOAM Turbomachinery OSIG test harness # This script will only initialize the test harness using CMake # # Author @@ -66,7 +66,7 @@ if [ -z "$WM_PROJECT_DIR" ] then echo "Warning:" echo " Missing environment variable \$WM_PROJECT_DIR. Stopping." - echo " Please make sure your OpenFOAM environment is properly set up." + echo " Please make sure your FOAM environment is properly set up." exit -1 fi diff --git a/testHarness/OSIG/Turbomachinery/runDir/Allrun_Experimental b/testHarness/OSIG/Turbomachinery/runDir/Allrun_Experimental index 23dab28a3..1dcb7a8f5 100755 --- a/testHarness/OSIG/Turbomachinery/runDir/Allrun_Experimental +++ b/testHarness/OSIG/Turbomachinery/runDir/Allrun_Experimental @@ -23,7 +23,7 @@ # along with foam-extend. If not, see . # # Description -# Allrun file for running the OpenFOAM Turbomachinery OSIG test harness +# Allrun file for running the FOAM Turbomachinery OSIG test harness # # Author # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved @@ -65,7 +65,7 @@ if [ -z "$WM_PROJECT_DIR" ] then echo "Warning:" echo " Missing environment variable \$WM_PROJECT_DIR. Stopping." - echo " Please make sure your OpenFOAM environment is properly set up." + echo " Please make sure your FOAM environment is properly set up." exit -1 fi diff --git a/testHarness/OSIG/Turbomachinery/runDir/Allrun_Nightly b/testHarness/OSIG/Turbomachinery/runDir/Allrun_Nightly index 4df84211e..1738c0a54 100755 --- a/testHarness/OSIG/Turbomachinery/runDir/Allrun_Nightly +++ b/testHarness/OSIG/Turbomachinery/runDir/Allrun_Nightly @@ -1,11 +1,11 @@ #!/bin/bash -# /*---------------------------------------------------------------------------*\ +# /*-------------------------------------------------------------------------*\ # ========= | # \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | # \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | -# ------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # License # This file is part of foam-extend. # @@ -23,12 +23,12 @@ # along with foam-extend. If not, see . # # Description -# Allrun file for running the OpenFOAM Turbomachinery OSIG test harness +# Allrun file for running the FOAM Turbomachinery OSIG test harness # # Author # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved # -# \*---------------------------------------------------------------------------*/ +# \*-------------------------------------------------------------------------*/ #set -x @@ -65,7 +65,7 @@ if [ -z "$WM_PROJECT_DIR" ] then echo "Warning:" echo " Missing environment variable \$WM_PROJECT_DIR. Stopping." - echo " Please make sure your OpenFOAM environment is properly set up." + echo " Please make sure your FOAM environment is properly set up." exit -1 fi diff --git a/testHarness/README.txt b/testHarness/README.txt index 3e31e5700..b5658f6b0 100644 --- a/testHarness/README.txt +++ b/testHarness/README.txt @@ -1,15 +1,15 @@ Description =========== -This part of the repository is for OpenFOAM test harnesses. +This part of the repository is for FOAM test harnesses. Directory Structure =================== -OpenFOAM : CMake/CTest scripts for compilation and execution test harness for OpenFOAM. -OpenFOAM/1.6-ext : Test harness for OpenFOAM version 1.6-ext. See the file OpenFOAM/1.6-ext/README.txt for more information +FOAM : CMake/CTest scripts for compilation and execution test harness for FOAM. +foam-extend-3.0 : Test harness for foam-extend version 3.0. See the file foam-extend-3.0/README.txt for more information -OSIG : CMake/CTest scripts for OpenFOAM Special Interest Group (OSIG) test harness +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. @@ -21,7 +21,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. git checkout master # For Hrv master branch -2: Make sure your OpenFOAM environment is properly configured to run OpenFOAM. +2: Make sure your FOAM environment is properly configured to run FOAM. 3: The minimal cmake version number for running the test loop is 2.8.0. Make sure you are there. @@ -33,9 +33,9 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. ls $WM_PROJECT_DIR/testHarness # Checking availability of testHarness under this branch -5: move to the runDir directory for the OpenFOAM test harness +5: move to the runDir directory for the FOAM test harness - cd $WM_PROJECT_DIR/testHarness/OpenFOAM/1.6-ext/runDir + cd $WM_PROJECT_DIR/testHarness/foam-extend/3.0/runDir 6: Normally, if using the master branch, everything should already be setup for you to run the test harness. @@ -47,7 +47,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. 7: Next, running the test loop is pretty simple: - cd $WM_PROJECT_DIR/testHarness/OpenFOAM/1.6-ext/runDir # you should already be there... + cd $WM_PROJECT_DIR/testHarness/foam-extend-3.0/runDir # you should already be there... ./Allclean ./Allrun_Experimental @@ -55,7 +55,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=OpenFOAM-1.6-ext + URL : http://openfoam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.0 9: You can customize your system identifier on the dashboard using the environment variable $CDASH_SUBMIT_LOCAL_HOST_ID. @@ -67,7 +67,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/OpenFOAM/1.6-ext/README.txt for the necessary information about running the +10: In general, see the file $WM_PROJECT_DIR/testHarness/foam-extend/3.0/README.txt for the necessary information about running the test loop. diff --git a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt similarity index 89% rename from testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt rename to testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt index 59ca455cb..75806c63d 100644 --- a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt +++ b/testHarness/foam-extend/3.0/CMakeFiles/CMakeLists.txt @@ -23,7 +23,7 @@ # # Description # CMakeLists.txt file for implementing a test harness for the compilation -# and test of OpenFOAM-1.6-ext using Kitware CTest./CMake/CDash +# and test of foam-extend-3.0 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(OpenFOAM_1.6-ext) +PROJECT(foam-extend-3.0) #----------------------------------------------------------------------------- # Initialization of CTest specific variables @@ -65,10 +65,10 @@ SET( CACHE STRING "Name of the local site" ) -#Grab the OpenFOAM installation directory. +#Grab the FOAM installation directory. SET( OF_ROOT $ENV{WM_PROJECT_DIR} - CACHE INTERNAL "OpenFOAM root directory." + CACHE INTERNAL "FOAM root directory." ) # Construct the build name. @@ -144,20 +144,20 @@ string(REPLACE "/" "_" SITE ${SITE}) # Build section #----------------------------------------------------------------------------- -# Compile OpenFOAM, libs and apps -add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION} ALL +# Compile FOAM, libs and apps +add_custom_target (foam-extend-$ENV{WM_PROJECT_VERSION} ALL ${OF_ROOT}/Allwmake ) set_property( - TARGET OpenFOAM-$ENV{WM_PROJECT_VERSION} - PROPERTY LABELS OpenFOAM-$ENV{WM_PROJECT_VERSION} + TARGET foam-extend-$ENV{WM_PROJECT_VERSION} + PROPERTY LABELS foam-extend-$ENV{WM_PROJECT_VERSION} ) -# Compile the OpenFOAM unit tests located under applications/test +# Compile the FOAM unit tests located under applications/test # This part will not be compiled and run by default. # This would be a good candidate for a sub-project -add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests +add_custom_target (foam-extend-$ENV{WM_PROJECT_VERSION}_unitTests wmake all ${OF_ROOT}/applications/test ) @@ -191,15 +191,15 @@ IF(BUILD_TESTING) SET(testIdSuffix "_oneTimeStep") ENDIF(RUN_FROM_ONE_TIMESTEP) - # OpenFOAM will run against this test suite: + # FOAM will run against this test suite: - # Add the suite of OpenFOAM tutorials + # Add the suite of FOAM tutorials # - INCLUDE($ENV{FOAM_TEST_HARNESS_DIR}/CMakeFiles/OpenFOAM_Tutorials.cmake) + INCLUDE($ENV{FOAM_TEST_HARNESS_DIR}/CMakeFiles/FOAM_Tutorials.cmake) # Add a dummy test (/bin/true, just for debugging) ADD_TEST( - OpenFOAM-$ENV{WM_PROJECT_VERSION}_Dummy_Test true + foam-extend-$ENV{WM_PROJECT_VERSION}_Dummy_Test true ) IF(RUN_FROM_ONE_TIMESTEP) diff --git a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CTestConfig.cmake.openfoam-extend b/testHarness/foam-extend/3.0/CMakeFiles/CTestConfig.cmake.openfoam-extend similarity index 80% rename from testHarness/OpenFOAM/1.6-ext/CMakeFiles/CTestConfig.cmake.openfoam-extend rename to testHarness/foam-extend/3.0/CMakeFiles/CTestConfig.cmake.openfoam-extend index 2808a760d..ffdd1fe3c 100644 --- a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CTestConfig.cmake.openfoam-extend +++ b/testHarness/foam-extend/3.0/CMakeFiles/CTestConfig.cmake.openfoam-extend @@ -4,10 +4,10 @@ ## # The following are required to uses Dart and the Cdash dashboard ## ENABLE_TESTING() ## INCLUDE(CTest) -set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext") +set(CTEST_PROJECT_NAME "foam-extend-3.0") 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") +set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.0") set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/OpenFOAM_Tutorials.cmake b/testHarness/foam-extend/3.0/CMakeFiles/FOAM_Tutorials.cmake similarity index 96% rename from testHarness/OpenFOAM/1.6-ext/CMakeFiles/OpenFOAM_Tutorials.cmake rename to testHarness/foam-extend/3.0/CMakeFiles/FOAM_Tutorials.cmake index aab0091e2..b6b41a7dd 100644 --- a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/OpenFOAM_Tutorials.cmake +++ b/testHarness/foam-extend/3.0/CMakeFiles/FOAM_Tutorials.cmake @@ -1,10 +1,10 @@ -# /*---------------------------------------------------------------------------*\ +# /*-------------------------------------------------------------------------*\ # ========= | # \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | # \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | -# ------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # License # This file is part of foam-extend. # @@ -22,12 +22,12 @@ # along with foam-extend. If not, see . # # Description -# CMake/CTest script for running the OpenFOAM tutorials +# CMake/CTest script for running the FOAM tutorials # # Author # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved # -# \*---------------------------------------------------------------------------*/ +# \*-------------------------------------------------------------------------*/ # Take care of tests specific variables IF(NOT DEFINED testIdSuffix) @@ -40,7 +40,7 @@ ENDIF(NOT DEFINED testRunTimeDirectory) # Use the current directory for running the test cases SET (TEST_CASE_DIR $ENV{PWD}/${testRunTimeDirectory} - CACHE INTERNAL "OpenFOAM test case directory." + CACHE INTERNAL "FOAM test case directory." ) # Create the runTime directory for the test cases diff --git a/testHarness/OpenFOAM/1.6-ext/README.txt b/testHarness/foam-extend/3.0/README.txt similarity index 88% rename from testHarness/OpenFOAM/1.6-ext/README.txt rename to testHarness/foam-extend/3.0/README.txt index d00c578f8..e92ba370f 100644 --- a/testHarness/OpenFOAM/1.6-ext/README.txt +++ b/testHarness/foam-extend/3.0/README.txt @@ -1,10 +1,10 @@ -# /*---------------------------------------------------------------------------*\ +# /*-------------------------------------------------------------------------*\ # ========= | # \\ / F ield | foam-extend: Open Source CFD # \\ / O peration | # \\ / A nd | For copyright notice see file Copyright # \\/ M anipulation | -# ------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # License # This file is part of foam-extend. # @@ -22,13 +22,14 @@ # along with foam-extend. If not, see . # # Description: -# README file for the CMake/CTest/CDash test harness for OpenFOAM. + README file for the CMake/CTest/CDash test harness for FOAM. # # Author: -# Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. -# \*---------------------------------------------------------------------------*/ +# Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved. +# +# \*-------------------------------------------------------------------------*/ -Warning #1: Make sure your OpenFOAM environment is properly initialized before +Warning #1: Make sure your FOAM environment is properly initialized before running the test harness. Warning #2: It is recommended to use cmake version 2.8.0 or newer for @@ -73,5 +74,5 @@ To submit your results to the CDash server on openfoam-extend, just use the file CTestConfig.cmake.openfoam-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=OpenFOAM-1.6-ext +http://openfoam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.0 diff --git a/testHarness/OpenFOAM/1.6-ext/runDir/Allclean b/testHarness/foam-extend/3.0/runDir/Allclean similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/runDir/Allclean rename to testHarness/foam-extend/3.0/runDir/Allclean diff --git a/testHarness/OpenFOAM/1.6-ext/runDir/Allrun_CMakeOnly b/testHarness/foam-extend/3.0/runDir/Allrun_CMakeOnly similarity index 92% rename from testHarness/OpenFOAM/1.6-ext/runDir/Allrun_CMakeOnly rename to testHarness/foam-extend/3.0/runDir/Allrun_CMakeOnly index 635a71475..af2a7f515 100755 --- a/testHarness/OpenFOAM/1.6-ext/runDir/Allrun_CMakeOnly +++ b/testHarness/foam-extend/3.0/runDir/Allrun_CMakeOnly @@ -23,7 +23,7 @@ # along with foam-extend. If not, see . # # Description -# Allrun file for running the OpenFOAM test harness +# Allrun file for running the FOAM test harness # This script will only initialize the test harness using CMake # # Author @@ -46,7 +46,7 @@ if [ -z "$WM_PROJECT_DIR" ] then echo "Warning:" echo " Missing environment variable \$WM_PROJECT_DIR. Stopping." - echo " Please make sure your OpenFOAM environment is properly set up." + echo " Please make sure your FOAM environment is properly set up." exit -1 fi @@ -56,7 +56,7 @@ then echo "Warning:" echo " Missing file: CMakeLists.txt under \$WM_PROJECT_DIR. Stopping." echo " A copy of CMakeLists.txt is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles." - echo " Please make a copy of this file under your OpenFOAM installation directory \$WM_PROJECT_DIR." + echo " Please make a copy of this file under your FOAM installation directory \$WM_PROJECT_DIR." exit -1 fi diff --git a/testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Experimental b/testHarness/foam-extend/3.0/runDir/Allrun_Experimental similarity index 92% rename from testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Experimental rename to testHarness/foam-extend/3.0/runDir/Allrun_Experimental index 7bb9015e6..a4af2f890 100755 --- a/testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Experimental +++ b/testHarness/foam-extend/3.0/runDir/Allrun_Experimental @@ -23,7 +23,7 @@ # along with foam-extend. If not, see . # # Description -# Allrun file for running the OpenFOAM test harness +# Allrun file for running the FOAM test harness # # Author # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved @@ -45,7 +45,7 @@ if [ -z "$WM_PROJECT_DIR" ] then echo "Warning:" echo " Missing environment variable \$WM_PROJECT_DIR. Stopping." - echo " Please make sure your OpenFOAM environment is properly set up." + echo " Please make sure your FOAM environment is properly set up." exit -1 fi @@ -55,7 +55,7 @@ then echo "Warning:" echo " Missing file: CMakeLists.txt under \$WM_PROJECT_DIR. Stopping." echo " A copy of CMakeLists.txt is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles." - echo " Please make a copy of this file under your OpenFOAM installation directory \$WM_PROJECT_DIR." + echo " Please make a copy of this file under your FOAM installation directory \$WM_PROJECT_DIR." exit -1 fi diff --git a/testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Nightly b/testHarness/foam-extend/3.0/runDir/Allrun_Nightly similarity index 92% rename from testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Nightly rename to testHarness/foam-extend/3.0/runDir/Allrun_Nightly index e8f1d186a..e4f72b4e6 100755 --- a/testHarness/OpenFOAM/1.6-ext/runDir/Allrun_Nightly +++ b/testHarness/foam-extend/3.0/runDir/Allrun_Nightly @@ -23,7 +23,7 @@ # along with foam-extend. If not, see . # # Description -# Allrun file for running the OpenFOAM test harness +# Allrun file for running the FOAM test harness # # Author # Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved @@ -45,7 +45,7 @@ if [ -z "$WM_PROJECT_DIR" ] then echo "Warning:" echo " Missing environment variable \$WM_PROJECT_DIR. Stopping." - echo " Please make sure your OpenFOAM environment is properly set up." + echo " Please make sure your FOAM environment is properly set up." exit -1 fi @@ -55,7 +55,7 @@ then echo "Warning:" echo " Missing file: CMakeLists.txt under \$WM_PROJECT_DIR. Stopping." echo " A copy of CMakeLists.txt is available under $FOAM_TEST_HARNESS_DIR/CMakeFiles." - echo " Please make a copy of this file under your OpenFOAM installation directory \$WM_PROJECT_DIR." + echo " Please make a copy of this file under your FOAM installation directory \$WM_PROJECT_DIR." exit -1 fi diff --git a/testHarness/OpenFOAM/1.6-ext/scripts/AdditionalRunFunctions b/testHarness/foam-extend/3.0/scripts/AdditionalRunFunctions similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/scripts/AdditionalRunFunctions rename to testHarness/foam-extend/3.0/scripts/AdditionalRunFunctions diff --git a/testHarness/OpenFOAM/1.6-ext/scripts/AdditionalRunFunctions.old b/testHarness/foam-extend/3.0/scripts/AdditionalRunFunctions.old similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/scripts/AdditionalRunFunctions.old rename to testHarness/foam-extend/3.0/scripts/AdditionalRunFunctions.old diff --git a/testHarness/OpenFOAM/1.6-ext/scripts/Allrun.default b/testHarness/foam-extend/3.0/scripts/Allrun.default similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/scripts/Allrun.default rename to testHarness/foam-extend/3.0/scripts/Allrun.default diff --git a/testHarness/OpenFOAM/1.6-ext/scripts/addMissingAllrunFileToTutorial.sh b/testHarness/foam-extend/3.0/scripts/addMissingAllrunFileToTutorial.sh similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/scripts/addMissingAllrunFileToTutorial.sh rename to testHarness/foam-extend/3.0/scripts/addMissingAllrunFileToTutorial.sh diff --git a/testHarness/OpenFOAM/1.6-ext/scripts/prepareCasesForOneTimeStep.sh b/testHarness/foam-extend/3.0/scripts/prepareCasesForOneTimeStep.sh similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/scripts/prepareCasesForOneTimeStep.sh rename to testHarness/foam-extend/3.0/scripts/prepareCasesForOneTimeStep.sh diff --git a/testHarness/OpenFOAM/1.6-ext/scripts/prepareCasesForTestHarness.sh b/testHarness/foam-extend/3.0/scripts/prepareCasesForTestHarness.sh similarity index 100% rename from testHarness/OpenFOAM/1.6-ext/scripts/prepareCasesForTestHarness.sh rename to testHarness/foam-extend/3.0/scripts/prepareCasesForTestHarness.sh