RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 01:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: Makefile: move REGTESTST_TYPE default setting

Browse Source 
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.
This commit is contained in:
William Lallemand 2021-02-05 11:27:54 +01:00
parent ed9892018c
commit c1ddcafdf9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -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"

2
scripts/run-regtests.sh
View File

@ -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=