From: Willy Tarreau <w@1wt.eu>
Date: Fri, 16 Nov 2018 14:54:23 +0000 (+0100)
Subject: REGTEST: fix scripts 1 and 3 to accept development version
X-Git-Tag: v1.9-dev7~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c27ea0a6a8e44a989fd2f9a4c63c243292955a0;p=thirdparty%2Fhaproxy.git

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

diff --git a/reg-tests/lua/b00001.vtc b/reg-tests/lua/b00001.vtc
index a7a2d6991d..213d423c15 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 c43381a80b..3f06b90a34 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 {