From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 25 Jun 2018 08:24:37 +0000 (+0200)
Subject: REGTEST/MINOR: Set HAPROXY_PROGRAM default value.
X-Git-Tag: v1.9-dev1~188
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bca3a980e9bc23b04050988650de069f863acc94;p=thirdparty%2Fhaproxy.git

REGTEST/MINOR: Set HAPROXY_PROGRAM default value.

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

diff --git a/Makefile b/Makefile
index 69f6ebb647..9ea3e80ce3 100644
--- 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