From 671f6beac1025c9288078894947c05fa7aba91da Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Tue, 19 Nov 2024 07:46:26 +0100
Subject: [PATCH] REGTESTS: silence the "log format ignored" warnings

Several tests were declaring a log format without having an explicit
log server configured, causing a warning. Let's clean them up.
---
 reg-tests/checks/tls_health_checks.vtc                        | 2 --
 reg-tests/compression/lua_validation.vtc                      | 3 ---
 .../http-rules/converters_ipmask_concat_strcmp_field_word.vtc | 4 ----
 reg-tests/http-rules/map_redirect.vtc                         | 3 +--
 reg-tests/sample_fetches/acl.vtc                              | 2 --
 reg-tests/seamless-reload/abns_socket.vtc                     | 2 --
 reg-tests/server/abnsz.vtc                                    | 2 --
 7 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index 9c268f485..e94a2c719 100644
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@@ -58,12 +58,10 @@ haproxy h1 -conf {
         use_backend be1
 
     frontend fe2
-        option tcplog
         bind "fd@${fe2}" ssl crt ${testdir}/common.pem
         use_backend be2
 
     frontend fe3
-        option httplog
         bind "fd@${fe3}" ssl crt ${testdir}/common.pem
         use_backend be3
 } -start
diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc
index b10cbd93e..b238ce8e9 100644
--- a/reg-tests/compression/lua_validation.vtc
+++ b/reg-tests/compression/lua_validation.vtc
@@ -8,13 +8,10 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
 global
-#	log stdout format short daemon
 	lua-load		${testdir}/lua_validation.lua
 
 defaults
 	mode			http
-	log			global
-	option			httplog
 
 frontend main-https
 	bind			"fd@${fe1}" ssl crt ${testdir}/common.pem
diff --git a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
index 55bcb5f9c..f19b7c148 100644
--- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
+++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
@@ -75,8 +75,6 @@ server s2 {
 haproxy h1 -conf {
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -136,8 +134,6 @@ haproxy h1 -conf {
 haproxy h2 -conf {
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc
index f55e0d825..e8ed03363 100644
--- a/reg-tests/http-rules/map_redirect.vtc
+++ b/reg-tests/http-rules/map_redirect.vtc
@@ -35,7 +35,6 @@ haproxy h1 -conf {
   defaults
     mode http
     log global
-    option httplog
     timeout connect  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client   "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server   "${HAPROXY_TEST_TIMEOUT-5s}"
@@ -63,7 +62,7 @@ haproxy h1 -conf {
 
     default_backend be1
 
-    backend be1
+  backend be1
     http-request redirect prefix %[var(txn.testvar)] code 301 if { var(txn.testvar) -m found }
     http-request deny
 
diff --git a/reg-tests/sample_fetches/acl.vtc b/reg-tests/sample_fetches/acl.vtc
index 905ae3ecf..21e6f4b52 100644
--- a/reg-tests/sample_fetches/acl.vtc
+++ b/reg-tests/sample_fetches/acl.vtc
@@ -19,8 +19,6 @@ haproxy h1 -conf {
         acl ACL4 acl(ACL2,!ACL3)
 
         http-request return status 200 hdr x-acl "ACL1=%[acl(ACL1)] ACL2=%[acl(ACL2)] ACL3=%[acl(ACL3)] ACL4=%[acl(ACL4)] TRUE=%[acl(TRUE)]"
-
-        log-format ACL1=%[acl(ACL1)]
 } -start
 
 client c1 -connect ${h1_fe1_sock} {
diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index 4a266afb8..3686a1f65 100644
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -29,8 +29,6 @@ haproxy h1 -W -S -conf {
 
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
diff --git a/reg-tests/server/abnsz.vtc b/reg-tests/server/abnsz.vtc
index 072cba98a..164d17274 100644
--- a/reg-tests/server/abnsz.vtc
+++ b/reg-tests/server/abnsz.vtc
@@ -12,8 +12,6 @@ haproxy h1 -W -S -conf {
 
   defaults
     mode http
-    log global
-    option httplog
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"