Merge pull request #3093 from dirkmueller/cli_tests_fixup

Handle newer less versions in zstdless testing
facebook · Mar 10, 2022 · c3a89ef · c3a89ef
2 parents 6a8fba9 + 7a3997c
commit c3a89ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -704,6 +704,7 @@ def setup_zstd_symlink_dir(zstd_symlink_dir: str, zstd: str) -> None:
     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,