From: Dirk Müller <dirk@dmllr.de>
Date: Wed, 9 Mar 2022 23:25:05 +0000 (+0100)
Subject: Handle newer less versions in zstdless testing
X-Git-Tag: v1.5.4^2~228^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3093%2Fhead;p=thirdparty%2Fzstd.git

Handle newer less versions in zstdless testing

Newer less versions appear to have changed how stderr
and stdout are showing error messages. hardcode the
expected behavior to make the tests pass with any less version.

Also set locale to C so that the strings are matching.
---

diff --git a/tests/cli-tests/cltools/zstdless.sh b/tests/cli-tests/cltools/zstdless.sh
index 61f768862..a0697bde6 100755
--- a/tests/cli-tests/cltools/zstdless.sh
+++ b/tests/cli-tests/cltools/zstdless.sh
@@ -7,4 +7,4 @@ zstdless file.zst
 println "+ pass parameters"
 zstdless -N file.zst # This parameter does not produce line #s when piped, but still serves to test that the flag went to less and not zstd
 println "+ bad path"
-zstdless bad.zst
+zstdless bad.zst >&2
diff --git a/tests/cli-tests/run.py b/tests/cli-tests/run.py
index 9bba2ecd1..b91aa9841 100755
--- a/tests/cli-tests/run.py
+++ b/tests/cli-tests/run.py
@@ -704,6 +704,7 @@ if __name__ == "__main__":
     env["ZSTDLESS_BIN"] = os.path.abspath(args.zstdless)
     env["COMMON"] = os.path.abspath(os.path.join(args.test_dir, "common"))
     env["PATH"] = bin_dir + ":" + os.getenv("PATH", "")
+    env["LC_ALL"] = "C"
 
     opts = Options(
         env=env,