From 7a3997c21a6e7620eaf6562b69326e23ffdde23d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dirk=20M=C3=BCller?= Date: Thu, 10 Mar 2022 00:25:05 +0100 Subject: [PATCH] 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. --- tests/cli-tests/cltools/zstdless.sh | 2 +- tests/cli-tests/run.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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, -- 2.47.2