From: Karel Zak <kzak@redhat.com>
Date: Tue, 14 Nov 2023 08:31:31 +0000 (+0100)
Subject: tests: don't keep bison messages in tests
X-Git-Tag: v2.40-rc1~151^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76b9791ef73bcaafa9d4912e16d0eb4a8d7ebba4;p=thirdparty%2Futil-linux.git

tests: don't keep bison messages in tests

Bison generates the 'syntax error' messages and depends on
the Bison version. For example, the current bison uses

        lsfd: failed to parse "(": syntax error, unexpected end of file

But the old version:

        lsfd: failed to parse "(": syntax error, unexpected $end

We do not control these strings, so it's better not to save them to our tests.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/lsfd/filter-broken-exp b/tests/expected/lsfd/filter-broken-exp
index 6ed2bf0ec9..61512e0117 100644
--- a/tests/expected/lsfd/filter-broken-exp
+++ b/tests/expected/lsfd/filter-broken-exp
@@ -1,4 +1,4 @@
-lsfd: failed to parse "(": syntax error, unexpected end of file
-lsfd: failed to parse ")": syntax error, unexpected ')'
-lsfd: failed to parse "(FD == 1)garbage": syntax error, unexpected HOLDER, expecting end of file
+lsfd: failed to parse "(": <bison syntax error message removed>
+lsfd: failed to parse ")": <bison syntax error message removed>
+lsfd: failed to parse "(FD == 1)garbage": <bison syntax error message removed>
 lsfd: unknown column: NOSUCHCOLUMN
diff --git a/tests/ts/lsfd/filter-broken-exp b/tests/ts/lsfd/filter-broken-exp
index 1cec451cf8..1854e508ea 100755
--- a/tests/ts/lsfd/filter-broken-exp
+++ b/tests/ts/lsfd/filter-broken-exp
@@ -31,4 +31,7 @@ ts_cd "$TS_OUTDIR"
     $TS_CMD_LSFD -Q 'NOSUCHCOLUMN'
 } > $TS_OUTPUT 2>&1
 
+sed -i -e 's/syntax error.*/<bison syntax error message removed>/g' \
+	$TS_OUTPUT $TS_ERRLOG
+
 ts_finalize