[llvm-branch-commits] [llvm-branch] r340349 - Merging r339091:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 21 15:34:54 2018
New Revision: 340349

URL: http://llvm.org/viewvc/llvm-project?rev=340349&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/   (props changed)
    llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/lit.cfg

Propchange: llvm/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 21 15:34:54 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338841,338902,338915,338968,339073,339166,339179,339184,339190,339225,339316,339319,339411,339492,339515,339533,339535-339536,339600,339636,339769,339822,339883,339895-339896,339945
+/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338841,338902,338915,338968,339073,339091,339166,339179,339184,339190,339225,339316,339319,339411,339492,339515,339533,339535-339536,339600,339636,339769,339822,339883,339895-339896,339945

Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/lit.cfg?rev=340349&r1=340348&r2=340349&view=diff
==============================================================================
--- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/lit.cfg (original)
+++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/lit.cfg Tue Aug 21 15:34:54 2018
@@ -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)))