From: Dmitry Goncharov <dgoncharov@users.sf.net>
Date: Sat, 8 Oct 2022 15:53:19 +0000 (-0400)
Subject: * tests/test_driver.pl (toplevel): [SV 63156] Keep temp env vars
X-Git-Tag: 4.3.91~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf2d71498c12ee09b6c9fe63a337c306442fd7f6;p=thirdparty%2Fmake.git

* tests/test_driver.pl (toplevel): [SV 63156] Keep temp env vars
---

diff --git a/tests/test_driver.pl b/tests/test_driver.pl
index 2beb7c99..18ee854d 100644
--- a/tests/test_driver.pl
+++ b/tests/test_driver.pl
@@ -219,9 +219,6 @@ sub toplevel
   $makeENV{LANG} = 'C';
   $makeENV{LANGUAGE} = 'C';
 
-  # Replace the environment with the new one
-  resetENV();
-
   $| = 1;                     # unbuffered output
 
   $debug = 0;                 # debug flag
@@ -271,6 +268,9 @@ sub toplevel
   $makeENV{TMP} = $temppath;
   $makeENV{TEMP} = $temppath;
 
+  # Replace the environment with the new one
+  resetENV();
+
   $workpath = "$cwdslash$workdir";
   $scriptpath = "$cwdslash$scriptdir";