From: Jim Meyering <meyering@fb.com>
Date: Mon, 20 Sep 2021 05:44:25 +0000 (-0700)
Subject: tests: env-s.pl: avoid spurious failure on OS X
X-Git-Tag: v9.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0db3c69c2171e352b219d473cb5469ba635d8d;p=thirdparty%2Fcoreutils.git

tests: env-s.pl: avoid spurious failure on OS X

* tests/misc/env-S.pl: The __CF_USER_TEXT_ENCODING envvar
would cause many of these sub-tests to fail. Ignore it.
---

diff --git a/tests/misc/env-S.pl b/tests/misc/env-S.pl
index 73dcb5cfe1..81d70c9fe5 100755
--- a/tests/misc/env-S.pl
+++ b/tests/misc/env-S.pl
@@ -30,6 +30,12 @@ $env = $1;
 # Turn off localization of executable's output.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
+# This envvar is somehow set at least on macOS 11.6, and would
+# otherwise cause failure of q*, t* and more tests below.  Ignore it.
+my $cf = '__CF_USER_TEXT_ENCODING';
+exists $ENV{$cf}
+  and $env .= " -u$cf";
+
 my @Tests =
     (
      # Test combination of -S and regular arguments