From ac4c8232da0dc7bd3609677120ce1116b35001c0 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Fri, 5 Feb 2021 11:27:54 +0100 Subject: [PATCH] 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. (cherry picked from commit c1ddcafdf9b425ff4ac2f1e3f1662a9133fc4cf6) Signed-off-by: Willy Tarreau (cherry picked from commit 99e4ce23d220f620b3bf2b8e2780a9b599ffba91) Signed-off-by: Willy Tarreau (cherry picked from commit 882debd98e6c385b31dad9bbbb0b597a8844f6b4) Signed-off-by: Christopher Faulet --- Makefile | 3 +-- scripts/run-regtests.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5f612e4..49f6cc8 100644 --- a/Makefile +++ b/Makefile @@ -997,7 +997,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 @@ -1027,7 +1026,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 c30c8cf..ade8e17 100755 --- a/scripts/run-regtests.sh +++ b/scripts/run-regtests.sh @@ -123,7 +123,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= -- 1.7.10.4