Merge branch 'v2.4' of https://github.com/plumed/plumed2 into v2.4

CHANGES/v2.4.md

@@ -100,3 +100,4 @@ Fixes after alpha release:
     arguments such as `HEIGHT=exp(0.5)`.
   - \ref CUSTOM function has been added as an alias to \ref MATHEVAL .
   - (developers): `configure.ac` has been simplified and improved in order to more easily probe C++ libraries.
+  - (developers): added `plumed_custom_skip` function to regtests in order to skip specific tests based on specific conditions (e.g. OS).

regtest/scripts/run

@@ -98,11 +98,18 @@ do
   echo "Checking for $module"
   if ! $plumed config -q module $module
   then
-    echo "NOT_APPLIABLE ($need MODULE NOT INSTALLED)"
+    echo "NOT_APPLIABLE ($module MODULE NOT INSTALLED)"
     exit 0;
   fi
 done
 
+if type -t plumed_custom_skip 1>/dev/null ; then
+  if plumed_custom_skip ; then
+    echo "NOT_APPLIABLE (plumed_custom_skip)"
+    exit 0;
+  fi
+fi
+
 if type -t plumed_regtest_before 1>/dev/null ; then
   plumed_regtest_before
 fi