From: Joel E. Denny <jdenny.ornl@gmail.com>
Date: Thu, 1 Aug 2019 22:26:37 +0000 (+0000)
Subject: Revert r367123: "[llvm] [lit/tests] Replace 'env -u' with more portable construct"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25e4d7813e18b042ee16366b6ff81e388268e160;p=llvm

Revert r367123: "[llvm] [lit/tests] Replace 'env -u' with more portable construct"

Must be reverted in order to revert r366980, which breaks windows
bots.  See recent D65335 and D65156 comments.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@367626 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/lit/tests/lit.cfg b/utils/lit/tests/lit.cfg
index e1034dc225a..2830956f80d 100644
--- a/utils/lit/tests/lit.cfg
+++ b/utils/lit/tests/lit.cfg
@@ -53,7 +53,7 @@ config.substitutions.append(('%{inputs}', os.path.join(
     config.test_source_root, 'Inputs')))
 config.substitutions.append(('%{lit}',
     "{env} %{{python}} {lit}".format(
-        env="env FILECHECK_OPTS= FILECHECK_DUMP_INPUT_ON_FAILURE=",
+        env="env -u FILECHECK_OPTS -u FILECHECK_DUMP_INPUT_ON_FAILURE",
         lit=os.path.join(lit_path, 'lit.py'))))
 config.substitutions.append(('%{python}', '"%s"' % (sys.executable)))