From 6da0879083749d5f098b8b2f4d459a70260491d2 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Fri, 14 Jun 2024 16:56:58 +0200 Subject: [PATCH] REGTESTS: ssl: fix some regtests 'feature cmd' start condition Since patch fde517b ("REGTESTS: wolfssl: temporarly disable some failing reg-tests") some 'feature cmd' lines have an extra quotation mark, so they were disable in every cases. Must be backported to 2.9. --- reg-tests/http-messaging/srv_ws.vtc | 2 +- reg-tests/ssl/set_ssl_cafile.vtc | 2 +- reg-tests/ssl/set_ssl_crlfile.vtc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reg-tests/http-messaging/srv_ws.vtc b/reg-tests/http-messaging/srv_ws.vtc index f0f5f8b11..996981333 100644 --- a/reg-tests/http-messaging/srv_ws.vtc +++ b/reg-tests/http-messaging/srv_ws.vtc @@ -4,7 +4,7 @@ varnishtest "h2 backend websocket management via server keyword" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)' && !ssllib_name_startswith(wolfSSL)'" +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && !ssllib_name_startswith(wolfSSL)'" feature ignore_unknown_macro # haproxy server diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc index 3881a4227..b948b4bd7 100644 --- a/reg-tests/ssl/set_ssl_cafile.vtc +++ b/reg-tests/ssl/set_ssl_cafile.vtc @@ -16,7 +16,7 @@ varnishtest "Test the 'set ssl ca-file' feature of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)' && !ssllib_name_startswith(wolfSSL)'" +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && !ssllib_name_startswith(wolfSSL)'" feature cmd "command -v socat" feature ignore_unknown_macro diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc index f018a3329..54d599859 100644 --- a/reg-tests/ssl/set_ssl_crlfile.vtc +++ b/reg-tests/ssl/set_ssl_crlfile.vtc @@ -19,7 +19,7 @@ varnishtest "Test the 'set ssl crl-file' feature of the CLI" feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" -feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)' && !ssllib_name_startswith(wolfSSL)'" +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && !ssllib_name_startswith(wolfSSL)'" feature cmd "command -v socat" feature ignore_unknown_macro