[llvm] r350850 - [FileCheck] Don't propagate `FILECHECK_DUMP_INPUT_ON_FAILURE` and

[Dan Liew via llvm-commits]

Author: delcypher
Date: Thu Jan 10 09:24:06 2019
New Revision: 350850

URL: http://llvm.org/viewvc/llvm-project?rev=350850&view=rev
Log:
[FileCheck] Don't propagate `FILECHECK_DUMP_INPUT_ON_FAILURE` and
`FILECHECK_OPTS` into environment for FileCheck tests.

Summary:

This fixes the following FileCheck tests:

* FileCheck/dump-input-enable.txt
* FileCheck/match-full-lines.txt

when `FILECHECK_DUMP_INPUT_ON_FAILURE` is set in the environment.

By default llvm-lit propagates `FILECHECK_DUMP_INPUT_ON_FAILURE` and
`FILECHECK_OPTS` from llvm-lit's environment into the test environment.
Unfortunately this can break FileCheck's tests because they expect that
these environment variables not to be set.

rdar://problem/47176262

Reviewers: jdenny, probinson, george.karpenkov

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D56541

Added:
    llvm/trunk/test/FileCheck/lit.local.cfg

Added: llvm/trunk/test/FileCheck/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FileCheck/lit.local.cfg?rev=350850&view=auto
==============================================================================
--- llvm/trunk/test/FileCheck/lit.local.cfg (added)
+++ llvm/trunk/test/FileCheck/lit.local.cfg Thu Jan 10 09:24:06 2019
@@ -0,0 +1,13 @@
+# Unset environment variables that the FileCheck tests
+# expect not to be set.
+file_check_expected_unset_vars = [
+  'FILECHECK_DUMP_INPUT_ON_FAILURE',
+  'FILECHECK_OPTS',
+]
+
+for env_var in file_check_expected_unset_vars:
+  if env_var in config.environment:
+    lit_config.note('Removing {} from environment for FileCheck tests'.format(
+      env_var)
+    )
+    config.environment.pop(env_var)