Merge branch 'v2.3' into v2.4

regtest/scripts/check

@@ -30,6 +30,8 @@ dirs=$(
   done
 )
 
+file1=$(mktemp)
+file2=$(mktemp)
 
 for dir in $dirs
 do
@@ -38,22 +40,24 @@ do
   if [ -n "$html" ] ; then
     fullname='<a href="'"$file"'">'"$file"'</a>'
   fi
-  if grep -q NOT_APPLIABLE $file ; then
+  if grep -q NOT_APPLICABLE $file ; then
     ((notapp++))
-    echo + test $dir NOT APPLIABLE
-    echo + check file $fullname for more information
+    echo + test $dir NOT APPLICABLE >> $file1
+    echo + check file $fullname for more information >> $file1
   elif grep -q FAILURE $file ; then
     ((nerror++))
-    echo + ERROR in test $dir
-    echo + check file $fullname for more information
+    echo + ERROR in test $dir >> $file2
+    echo + check file $fullname for more information >> $file2
   else
     ((nok++))
   fi
 done
+cat $file1
+cat $file2
 
 echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo "+ Final report:"
-echo "+ $((nok+nerror)) tests performed, $notapp tests not appliable"
+echo "+ $((nok+nerror)) tests performed, $notapp tests not applicable"
 echo "+ $nerror errors found"
 if ((nerror==0)) ; then
 echo "+ Well done!!"
@@ -68,7 +72,7 @@ fi
 
 if [ "$PLUMED_ALL_TESTS" = yes ] ; then
   if (($notapp>0)) ; then
-    echo "+ You are running with PLUMED_ALL_TESTS=yes and some tests are not appliable"
+    echo "+ You are running with PLUMED_ALL_TESTS=yes and some tests are not applicable"
     echo "+ This is likely happening on the first job under TRAVIS-CI"
     echo "+ Please check that all modules have been properly enabled!"
     if [ -n "$fail" ] ; then

regtest/scripts/run

@@ -67,7 +67,7 @@ mpi="${PLUMED_MPIRUN:-mpirun} -np $mpiprocs"
 
 if ! plumed config -q has mpi
 then
-  echo "NOT_APPLIABLE (MPI NOT INSTALLED)"
+  echo "NOT_APPLICABLE (MPI NOT INSTALLED)"
   exit 0;
 fi
 
@@ -79,7 +79,7 @@ fi
 
 if ((mpiprocs>0)) && [[ "$valgrind" != "env" ]]
 then
-  echo "NOT_APPLIABLE (MPI cannot be used with valgrind)"
+  echo "NOT_APPLICABLE (MPI cannot be used with valgrind)"
   exit 0;
 fi
 
@@ -88,7 +88,7 @@ do
   echo "Checking for $need"
   if ! $plumed config -q has $need
   then
-    echo "NOT_APPLIABLE ($need NOT ENABLED)"
+    echo "NOT_APPLICABLE ($need NOT ENABLED)"
     exit 0;
   fi
 done
@@ -98,7 +98,7 @@ do
   echo "Checking for $module"
   if ! $plumed config -q module $module
   then
-    echo "NOT_APPLIABLE ($module MODULE NOT INSTALLED)"
+    echo "NOT_APPLICABLE ($module MODULE NOT INSTALLED)"
     exit 0;
   fi
 done