]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTEST/MINOR: Set HAPROXY_PROGRAM default value.
authorFrédéric Lécaille <flecaille@haproxy.com>
Mon, 25 Jun 2018 08:24:37 +0000 (10:24 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 25 Jun 2018 20:04:42 +0000 (22:04 +0200)
With this patch, we set HAPROXY_PROGRAM environment variable
default value to the haproxy executable of the current working directory.
So, if the current directory is the haproxy sources directory,
the reg-tests Makefile target may be run with this shorter command:

  $ VARNISTEST_PROGRAM=<...> make reg-tests

in place of

  $ VARNISTEST_PROGRAM=<...> HAPROXY_PROGRAM=<...> make reg-tests

Makefile

index 69f6ebb647603115cd64659b5bb3692e0ab88e9c..9ea3e80ce3f7b3efb9ea0758ba09777620327395 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1005,5 +1005,5 @@ reg-tests:
                exit 1; \
        fi
        @find reg-tests -type f -name "*.vtc" -print0 | \
-          xargs -0 $(VARNISHTEST_PROGRAM) -l -t5
+          HAPROXY_PROGRAM=$${HAPROXY_PROGRAM:-$$PWD/haproxy} xargs -0 $(VARNISHTEST_PROGRAM) -l -t5
 .PHONY: reg-tests