maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r366980: "[lit] Protect full test suite from FILECHECK_OPTS" 

Windows bots are broken.  See recent D65335 and D65156 comments.

llvm-svn: 367627
This commit is contained in:
Joel E. Denny 2019-08-01 22:26:51 +00:00
parent 7f7b3f1131
commit c69c46ff7a
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/utils/lit/tests/lit.cfg
View File

@ -44,17 +44,10 @@ for attribute in ('llvm_tools_dir', 'lit_tools_dir'):
if directory: if directory:
llvm_config.with_environment('PATH', directory, append_path=True) 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.substitutions.append(('%{inputs}', os.path.join(
config.test_source_root, 'Inputs'))) config.test_source_root, 'Inputs')))
config.substitutions.append(('%{lit}', config.substitutions.append(('%{lit}', "%%{python} %s" % (
"{env} %{{python}} {lit}".format( os.path.join(lit_path, 'lit.py'),)))
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))) config.substitutions.append(('%{python}', '"%s"' % (sys.executable)))
# Enable coverage.py reporting, assuming the coverage module has been installed # Enable coverage.py reporting, assuming the coverage module has been installed

2
llvm/utils/lit/tests/shtest-run-at-line.py
View File

@ -1,7 +1,7 @@
# Check that -vv makes the line number of the failing RUN command clear. # Check that -vv makes the line number of the failing RUN command clear.
# (-v is actually sufficient in the case of the internal shell.) # (-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 # RUN: FileCheck --input-file %t.out %s
# #
# END. # END.