Skip to content

Commit

Permalink
Merging r339091:
Browse files Browse the repository at this point in the history
------------------------------------------------------------------------
r339091 | stella.stamenova | 2018-08-07 06:08:46 +0200 (Tue, 07 Aug 2018) | 12 lines

[lit, tests] Fix failing lit test: shtest-format.py

Summary:
The problem here is that on windows double quotes are used for paths (usually) while single quotes are not. This is not generally a problem for the tests because the lit infrastructure tends to treat both the same. One (and possibly only) exception is when some tests are run in an external shell such as some of the shtest-format tests. In this case on windows the path to python was not created correctly because it had single quotes and the test failed.

This same test is already failing with python 3 which is why our testing missed the new failure. This patch will take care of the immediate failure with python 2 and I'll send a follow up for the python 3 failure.

Reviewers: asmith, zturner

Subscribers: delcypher, llvm-commits

Differential Revision: https://reviews.llvm.org/D50373
------------------------------------------------------------------------

llvm-svn: 340349
  • Loading branch information
zmodem committed Aug 21, 2018
1 parent 9d0c8d3 commit e23b77c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion llvm/utils/lit/tests/Inputs/shtest-format/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ config.test_source_root = None
config.test_exec_root = None
config.target_triple = 'x86_64-unknown-unknown'
config.available_features.add('a-present-feature')
config.substitutions.append(('%{python}', "'%s'" % (sys.executable)))
config.substitutions.append(('%{python}', '"%s"' % (sys.executable)))

0 comments on commit e23b77c

Please sign in to comment.