diff options
| author | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-08-01 22:26:51 +0000 |
|---|---|---|
| committer | Joel E. Denny <jdenny.ornl@gmail.com> | 2019-08-01 22:26:51 +0000 |
| commit | c69c46ff7ae0435d4c956cf87675dbb853ae6bbb (patch) | |
| tree | 1c34863b2d85c4c8c6152d3a2b1b7a35733b3174 | |
| parent | 7f7b3f11318a9bf537679d8cca8992bcbf026695 (diff) | |
| download | bcm5719-llvm-c69c46ff7ae0435d4c956cf87675dbb853ae6bbb.tar.gz bcm5719-llvm-c69c46ff7ae0435d4c956cf87675dbb853ae6bbb.zip | |
Revert r366980: "[lit] Protect full test suite from FILECHECK_OPTS"
Windows bots are broken. See recent D65335 and D65156 comments.
llvm-svn: 367627
| -rw-r--r-- | llvm/utils/lit/tests/lit.cfg | 11 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/shtest-run-at-line.py | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg index 2830956f80d..ebdcb5000b9 100644 --- a/llvm/utils/lit/tests/lit.cfg +++ b/llvm/utils/lit/tests/lit.cfg @@ -44,17 +44,10 @@ for attribute in ('llvm_tools_dir', 'lit_tools_dir'): if directory: llvm_config.with_environment('PATH', directory, append_path=True) -# This test suite calls %{lit} to test lit's behavior for the sample test -# suites in %{inputs}. This test suite's results are then determined in part -# by %{lit}'s textual output, which includes the output of FileCheck calls -# within %{inputs}'s test suites. Thus, %{lit} clears environment variables -# that can affect FileCheck's output. config.substitutions.append(('%{inputs}', os.path.join( config.test_source_root, 'Inputs'))) -config.substitutions.append(('%{lit}', - "{env} %{{python}} {lit}".format( - env="env -u FILECHECK_OPTS -u FILECHECK_DUMP_INPUT_ON_FAILURE", - lit=os.path.join(lit_path, 'lit.py')))) +config.substitutions.append(('%{lit}', "%%{python} %s" % ( + os.path.join(lit_path, 'lit.py'),))) config.substitutions.append(('%{python}', '"%s"' % (sys.executable))) # Enable coverage.py reporting, assuming the coverage module has been installed diff --git a/llvm/utils/lit/tests/shtest-run-at-line.py b/llvm/utils/lit/tests/shtest-run-at-line.py index cd0e08137ee..7e5d53b8e26 100644 --- a/llvm/utils/lit/tests/shtest-run-at-line.py +++ b/llvm/utils/lit/tests/shtest-run-at-line.py @@ -1,7 +1,7 @@ # Check that -vv makes the line number of the failing RUN command clear. # (-v is actually sufficient in the case of the internal shell.) # -# RUN: not %{lit} -j 1 -vv %{inputs}/shtest-run-at-line > %t.out +# RUN: env -u FILECHECK_OPTS not %{lit} -j 1 -vv %{inputs}/shtest-run-at-line > %t.out # RUN: FileCheck --input-file %t.out %s # # END. |
