Merge remote branch 'origin/testLoop/MartinBeaudoin' into testLoop/PhilipposeRajan

testHarness/OpenFOAM/1.6-ext/README.txt

@@ -48,14 +48,14 @@ 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.openfoam-extend_of-1.6-ext-testing $WM_PROJECT_DIR/CTestConfig.cmake
 
 
 c) Run the test harness and push your results on the CDash server on openfoam-extend
 
-cd ./runDir; ./Allrun_Experimental
+cd ./runDir; ./Allclean; ./Allrun_Experimental
   or
-cd ./runDir; ./Allrun_Nightly
+cd ./runDir; ./Allclean; ./Allrun_Nightly
 
 
 2: Instructions for restarting your setup from scratch:
@@ -74,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.5-dev
+http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext_testing
 

testHarness/OpenFOAM/1.6-ext/scripts/prepareCasesForTestHarness.sh

@@ -44,9 +44,11 @@ ADDITIONAL_SHELL_FUNCTIONS=$2
 
 for AR in `find ${TEST_RUN_DIR} -name Allrun`
 do
+    # Make sure we are using /bin/bash as the activation shell
     # Replace the macro runApplication with runApplicationAndReportOnError
     mv ${AR} ${AR}.org
     sed \
+	-e s/"#!\/bin\/sh"/"#!\/bin\/bash"/g \
 	-e s/"runApplication "/"runApplicationAndReportOnError "/g \
         -e /RunFunctions/r${ADDITIONAL_SHELL_FUNCTIONS} \
 	${AR}.org > ${AR}

testHarness/README.txt

@@ -7,7 +7,7 @@ Directory Structure
 ===================
 
 OpenFOAM            : CMake/CTest scripts for compilation and execution test harness for OpenFOAM.
-OpenFOAM/1.5-dev    : Test harness for OpenFOAM version 1.5-dev. See the file OpenFOAM/1.5-dev/README.txt for more information
+OpenFOAM/1.6-dev    : Test harness for OpenFOAM version 1.6-dev. See the file OpenFOAM/1.6-dev/README.txt for more information
 
 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.

tutorials/coupled/conjugateHeatFoam/heatedBlock/Allrun

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+# Disabling the tutorial.
+# Using an exit code != 0 will still flag the tutorial as failed 
+echo "Warning: This tutorial is currently disabled."
+exit -1
+
+runApplication blockMesh
+runApplication $application

tutorials/incompressible/icoDyMFoam/movingCone/system/controlDict

@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoamAutoMotion;
+application     icoDyMFoam;
 
 startFrom       startTime;
 

tutorials/incompressible/icoDyMFoam/movingConeMotion/Allrun

@@ -6,6 +6,6 @@
 application="icoDyMFoam"
 
 compileApplication setMotionMovingCone
-runApplication setMotionMovingCone
 runApplication blockMesh
+runApplication setMotionMovingCone
 runApplication $application

tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict

@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application interFoam;
+application     multiphaseInterFoam;
 
 startFrom       latestTime;
 

tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict

@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application interFoam;
+application     multiphaseInterFoam;
 
 startFrom       latestTime;