From 096334d33a33e73b94ed5482afd0da73a307ef01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Tue, 12 Apr 2022 12:50:40 +0100
Subject: [PATCH] tests: env-S.pl: unset Cygwin hardwired env vars

* tests/misc/env-S.pl: Unset SYSTEMROOT and WINDIR.
---
 tests/misc/env-S.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/misc/env-S.pl b/tests/misc/env-S.pl
index 67d4037cb..b11836d29 100755
--- a/tests/misc/env-S.pl
+++ b/tests/misc/env-S.pl
@@ -33,8 +33,12 @@ $env = $1;
 # 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";
+exists $ENV{$cf} and $env .= " -u$cf";
+# Likewise for these Cygwin env vars
+my $cf = 'SYSTEMROOT';
+exists $ENV{$cf} and $env .= " -u$cf";
+my $cf = 'WINDIR';
+exists $ENV{$cf} and $env .= " -u$cf";
 
 my @Tests =
     (
-- 
2.26.2