FEATURE: Prepared testLoop for release of 3.2 version and migrated CDash to foam-extend SF project. Author: Martin Beaudoin. Merge: Dominik Christ.

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

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)

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.
 
 

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

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)

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