[master] 9784b3984 Merge HAproxy behavioural change

[Poul-Henning Kamp]

commit 9784b3984f117250417ee50405ac59d26637e043
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 15 09:32:02 2024 +0000

    Merge HAproxy behavioural change
    
    https://github.com/vtest/VTest/pull/32

diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index b5053d0e8..d2d9d5daa 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -55,7 +55,6 @@
 #define HAPROXY_OPT_DAEMON	"-D"
 #define HAPROXY_SIGNAL		SIGINT
 #define HAPROXY_EXPECT_EXIT	(128 + HAPROXY_SIGNAL)
-#define HAPROXY_GOOD_CONF	"Configuration file is valid"
 
 struct envar {
 	VTAILQ_ENTRY(envar) list;
@@ -1077,8 +1076,9 @@ cmd_haproxy(CMD_ARGS)
 		if (!strcmp(*av, "-conf-OK")) {
 			AN(av[1]);
 			haproxy_store_conf(h, av[1], 0);
+			h->expect_exit = 0;
+			haproxy_check_conf(h, "");
 			av++;
-			haproxy_check_conf(h, HAPROXY_GOOD_CONF);
 			continue;
 		}
 		if (!strcmp(*av, "-conf-BAD")) {