From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 19 Dec 2022 16:17:08 +0000 (+0100)
Subject: regress: Fix daemon-connection-xxx tests
X-Git-Tag: Beta-15.0.0~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701659794f9a636e968277f51aff1048db3f69d3;p=thirdparty%2Fbacula.git

regress: Fix daemon-connection-xxx tests
---

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 81c6f07d1..8c4db7b9d 100755
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -293,7 +293,7 @@ check_connection_tls_logs()
       tls_str="without encryption"
    fi
 
-   n=`cat $1 | grep ".*\-dir .* Connected to Storage .* ${tls_str}" | wc -l`
+   n=`cat $1 | grep -- "-dir .* Connected to Storage .* ${tls_str}" | wc -l`
    if [ $n -ne $3 ]; then
       estat=1
       print_debug "Wrong log lines regarding Director Connecting Storage ${tls_str}: ${n} in restore log, expected $3"
@@ -301,21 +301,21 @@ check_connection_tls_logs()
    fi
 
 
-   n=`cat $1 | grep ".*\-dir .* Connected to Client .* ${tls_str}" | wc -l`
+   n=`cat $1 | grep -- "-dir .* Connected to Client .* ${tls_str}" | wc -l`
    if [ $n -ne $4 ]; then
       estat=1
       print_debug "Wrong log lines regarding Director Connecting Client ${tls_str}: ${n} in restore log, expected $4"
       print_debug "see: $1"
    fi
 
-   n=`cat $1 | grep ".*\-sd .* Connected to Client .* ${tls_str}" | wc -l`
+   n=`cat $1 | grep -- "-sd .* Connected to Client .* ${tls_str}" | wc -l`
    if [ $n -ne $5 ]; then
       estat=1
       print_debug "Wrong log lines regarding Storage Connecting Client ${tls_str}: ${n} in restore log, expected $5"
       print_debug "see: $1"
    fi
 
-   n=`cat $1 | grep ".*\-fd .* Connected to Storage .* ${tls_str}" | wc -l`
+   n=`cat $1 | grep -- "-fd .* Connected to Storage .* ${tls_str}" | wc -l`
    if [ $n -ne $6 ]; then
       estat=1
       print_debug "Wrong log lines regarding Client Connecting Storage ${tls_str}: ${n} in restore log, expected $6"