REGTEST: script: Add the option --use-htx to enable the HTX in regtests

A check is done on HAProxy version to be sure it is supported. Internally, by
default, the macro 'no-htx' is set to "#". So in regtests, we can prefix
http-use-htx option line with this macro to inhibit the HTX. Concretly, this
line can be added in the HAProxy configuration:

   ${no-htx} option http-use-htx

When the option --use-htx is used, the macro 'no-htx' is unset.
This commit is contained in:
Christopher Faulet 2018-12-19 11:22:04 +01:00
parent 9c6df5ecb4
commit fa6798f97c
1 changed files with 23 additions and 1 deletions

View File

@ -31,6 +31,13 @@ _help()
--clean to cleanup previous reg-tests log directories and exit --clean to cleanup previous reg-tests log directories and exit
run-regtests.sh --clean run-regtests.sh --clean
--use-htx to use the HTX in tests
run-regtests.sh --use-htx, unsets the macro \${no-htx}
In .vtc files, in HAProxy configuration, you should use the following line
to "templatize" your tests:
\${no-htx} option http-use-htx
Including text below into a .vtc file will check for its requirements Including text below into a .vtc file will check for its requirements
related to haproxy's target and compilation options related to haproxy's target and compilation options
# Below targets are not capable of completing this test succesfully # Below targets are not capable of completing this test succesfully
@ -269,6 +276,9 @@ _process() {
LEVEL="$2" LEVEL="$2"
shift shift
;; ;;
--use-htx)
no_htx=""
;;
--clean) --clean)
_cleanup _cleanup
exit 0 exit 0
@ -302,6 +312,7 @@ jobcount=""
verbose="-q" verbose="-q"
debug="" debug=""
keep_logs="-l" keep_logs="-l"
no_htx="#"
testlist="" testlist=""
_process "$@"; _process "$@";
@ -404,6 +415,17 @@ echo "Target : $TARGET"
echo "Options : $OPTIONS" echo "Options : $OPTIONS"
echo "########################## Gathering tests to run ##########################" echo "########################## Gathering tests to run ##########################"
# if 'use-htx' option is set, but HAProxy version is lower to 1.9, disable it
if [ -z "$no_htx" ]; then
if [ $(_version "$HAPROXY_VERSION") -lt $(_version "1.9") ]; then
echo ""
echo "WARNING : Unset HTX for haproxy (version: $HAPROXY_VERSION)"
echo " REASON: this test requires at least version: 1.9"
echo ""
no_htx="#"
fi
fi
if [ -z "$REGTESTS" ]; then if [ -z "$REGTESTS" ]; then
_findtests ./ _findtests ./
else else
@ -419,7 +441,7 @@ if [ -n "$testlist" ]; then
if [ -n "$jobcount" ]; then if [ -n "$jobcount" ]; then
jobcount="-j $jobcount" jobcount="-j $jobcount"
fi fi
cmd="$VARNISHTEST_PROGRAM -k -t 10 $keep_logs $verbose $debug $jobcount $varnishtestparams $testlist" cmd="$VARNISHTEST_PROGRAM -k -t 10 -Dno-htx=${no_htx} $keep_logs $verbose $debug $jobcount $varnishtestparams $testlist"
eval $cmd eval $cmd
_vtresult=$? _vtresult=$?
else else