From 9c27ea0a6a8e44a989fd2f9a4c63c243292955a0 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 16 Nov 2018 15:54:23 +0100 Subject: [PATCH] REGTEST: fix scripts 1 and 3 to accept development version These scripts were checking that the program's name was exactly "haproxy" which clearly is not workable during development. --- reg-tests/lua/b00001.vtc | 8 ++++---- reg-tests/lua/b00003.vtc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reg-tests/lua/b00001.vtc b/reg-tests/lua/b00001.vtc index a7a2d6991..213d423c1 100644 --- a/reg-tests/lua/b00001.vtc +++ b/reg-tests/lua/b00001.vtc @@ -25,16 +25,16 @@ feature ignore_unknown_macro syslog Slog { recv notice - expect ~ "haproxy\\[[0-9]*\\]: Proxy f1 started" + expect ~ "[^:\\[ ]*\\[[0-9]*\\]: Proxy f1 started" recv notice - expect ~ "haproxy\\[[0-9]*\\]: Proxy f2 started" + expect ~ "[^:\\[ ]\\[[0-9]*\\]: Proxy f2 started" recv info - expect ~ "haproxy\\[[0-9]*\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*$" + expect ~ "[^:\\[ ]\\[[0-9]*\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*$" recv info - expect ~ "haproxy\\[[0-9]*\\]: Tc=[0-9]* Td=[0-9]* Th=[0-9]* Tt=[0-9]* Tw=[0-9]*$" + expect ~ "[^:\\[ ]\\[[0-9]*\\]: Tc=[0-9]* Td=[0-9]* Th=[0-9]* Tt=[0-9]* Tw=[0-9]*$" } -start haproxy h1 -conf { diff --git a/reg-tests/lua/b00003.vtc b/reg-tests/lua/b00003.vtc index c43381a80..3f06b90a3 100644 --- a/reg-tests/lua/b00003.vtc +++ b/reg-tests/lua/b00003.vtc @@ -19,7 +19,7 @@ feature ignore_unknown_macro syslog Slog -level info -repeat 100 { recv info - expect ~ "haproxy\\[${h1_pid}\\]: Ta=[0-9]* Tc=[0-9]* Td=-1 Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9] Tr=-1 Tt=[0-9]* Tw=[0-9]*" + expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Ta=[0-9]* Tc=[0-9]* Td=-1 Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9] Tr=-1 Tt=[0-9]* Tw=[0-9]*" } -start haproxy h1 -conf {