From: William Lallemand <wlallemand@haproxy.org>
Date: Fri, 5 Feb 2021 10:27:54 +0000 (+0100)
Subject: BUILD: Makefile: move REGTESTST_TYPE default setting
X-Git-Tag: v2.4-dev7~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ddcafdf9b425ff4ac2f1e3f1662a9133fc4cf6;p=thirdparty%2Fhaproxy.git

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 b0ab6bce52..81d9b3b4bf 100644
--- 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 27bb13cbf7..b3e4b13dd8 100755
--- 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=