[PATCH] D65335: [llvm] [lit/tests] Replace 'env -u' with more portable construct

Michał Górny via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Jul 26 07:11:59 PDT 2019


mgorny created this revision.
mgorny added reviewers: jdenny, probinson, delcypher, thopre, krytarowski.
Herald added a project: LLVM.
mgorny added a parent revision: D65334: [llvm] [FileCheck] Use FILECHECK_DUMP_INPUT_ON_FAILURE only when non-empty.

Set environment variables to empty values rather than attempting
to unset them via 'env -u', in order to fix NetBSD test regression
caused by r366980.  POSIX does not guarantee that env(1) supports '-u'
option, and indeed NetBSD env(1) does not support it.


Repository:
  rL LLVM

https://reviews.llvm.org/D65335

Files:
  llvm/utils/lit/tests/lit.cfg


Index: llvm/utils/lit/tests/lit.cfg
===================================================================
--- llvm/utils/lit/tests/lit.cfg
+++ llvm/utils/lit/tests/lit.cfg
@@ -53,7 +53,7 @@
     config.test_source_root, 'Inputs')))
 config.substitutions.append(('%{lit}',
     "{env} %{{python}} {lit}".format(
-        env="env -u FILECHECK_OPTS -u FILECHECK_DUMP_INPUT_ON_FAILURE",
+        env="env FILECHECK_OPTS= FILECHECK_DUMP_INPUT_ON_FAILURE=",
         lit=os.path.join(lit_path, 'lit.py'))))
 config.substitutions.append(('%{python}', '"%s"' % (sys.executable)))
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65335.211935.patch
Type: text/x-patch
Size: 573 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190726/3d350e96/attachment.bin>


More information about the llvm-commits mailing list