BUILD: Makefile: move REGTESTST_TYPE default setting

In patch 3bad3d5 ("BUILD: Makefile: exclude broken tests by default"),
the default setting of the REGTESTST_TYPE variable was set in the
Makefile instead of the run-regtests.sh script.

Doing it in the Makefile was breaking the use of this environment
varible with make ( REGTESTS_TYPES=slow,default make reg-tests )

This patch move the default setting from the Makefile to
run-regtests.sh. It also change the documentation in `make
reg-tests-help` about the default value.

This patch should be backported where 3bad3d5 is backported.

diff --git a/Makefile b/Makefile
index b0ab6bce52814e631db3b411e63ddc350b675305..81d9b3b4bf4d3d37dc4173b64b2df8fb8e28c30d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1044,7 +1044,6 @@ opts:
        @echo 'OBJS="$(strip $(OBJS))"'
 
 ifeq (reg-tests, $(firstword $(MAKECMDGOALS)))
-  REGTESTS_TYPES := default,bug,devel,slow
   REGTEST_ARGS := $(wordlist 2, $(words $(MAKECMDGOALS)), $(MAKECMDGOALS))
   $(eval $(REGTEST_ARGS):;@true)
 endif
@@ -1074,7 +1073,7 @@ reg-tests-help:
        @echo "To run tests with specific types:"
        @echo "    $$ REGTESTS_TYPES=slow,default make reg-tests"
        @echo
-       @echo "with 'any' as default value for REGTESTS_TYPES variable."
+       @echo "with 'default,bug,devel,slow' as default value for REGTESTS_TYPES variable."
        @echo
        @echo "About the reg test types:"
        @echo "    any         : all the tests without distinction (this is the default"

diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index 27bb13cbf75b83b87988d6e60bf147ae6e3e337e..b3e4b13dd828daab5a3106f7aa5e060832cb0c71 100755 (executable)
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -128,7 +128,7 @@ _startswith() {
 _findtests() {
   set -f
 
-  REGTESTS_TYPES="${REGTESTS_TYPES:-any}"
+  REGTESTS_TYPES="${REGTESTS_TYPES:-default,bug,devel,slow}"
   any_test=$(echo $REGTESTS_TYPES | grep -cw "any")
   for i in $( find "$1" -name *.vtc ); do
     skiptest=