summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2018-08-21 22:34:54 +0000
committerHans Wennborg <hans@hanshq.net>2018-08-21 22:34:54 +0000
commite23b77ca937f826d0561c0a02a1b5a414a3fc148 (patch)
tree361ffb2642073072133a95f628ef1338ec09ef25
parent9d0c8d3f8759ee64c36fad12a68c23c830eb73ac (diff)
downloadbcm5719-llvm-e23b77ca937f826d0561c0a02a1b5a414a3fc148.tar.gz
bcm5719-llvm-e23b77ca937f826d0561c0a02a1b5a414a3fc148.zip
Merging r339091:
------------------------------------------------------------------------ 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
-rw-r--r--llvm/utils/lit/tests/Inputs/shtest-format/lit.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/lit/tests/Inputs/shtest-format/lit.cfg b/llvm/utils/lit/tests/Inputs/shtest-format/lit.cfg
index 607538e901a..38c3da3d3cd 100644
--- a/llvm/utils/lit/tests/Inputs/shtest-format/lit.cfg
+++ b/llvm/utils/lit/tests/Inputs/shtest-format/lit.cfg
@@ -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)))
OpenPOWER on IntegriCloud