[llvm-branch-commits] [lldb] r339657 - Merging r339076:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 14 01:51:28 2018
New Revision: 339657

URL: http://llvm.org/viewvc/llvm-project?rev=339657&view=rev
Log:
Merging r339076:
------------------------------------------------------------------------
r339076 | stella.stamenova | 2018-08-07 00:37:53 +0200 (Tue, 07 Aug 2018) | 10 lines

[lit, python] Always add quotes around the python path in lit

Summary:
The issue with the python path is that the path to python on Windows can contain spaces. To make the tests always work, the path to python needs to be surrounded by quotes.

This is a companion change to: https://reviews.llvm.org/D50206

Reviewers: asmith, zturner

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

Modified:
    lldb/branches/release_70/   (props changed)
    lldb/branches/release_70/lit/lit.cfg

Propchange: lldb/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 14 01:51:28 2018
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:338949
+/lldb/trunk:338949,339076

Modified: lldb/branches/release_70/lit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_70/lit/lit.cfg?rev=339657&r1=339656&r2=339657&view=diff
==============================================================================
--- lldb/branches/release_70/lit/lit.cfg (original)
+++ lldb/branches/release_70/lit/lit.cfg Tue Aug 14 01:51:28 2018
@@ -54,7 +54,7 @@ config.environment['LLVM_SRC_ROOT'] = ge
 config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable', '')
 
 # Register substitutions
-config.substitutions.append(('%python', config.python_executable))
+config.substitutions.append(('%python', "'%s'" % (config.python_executable)))
 
 debugserver = lit.util.which('debugserver', lldb_tools_dir)
 lldb = "%s -S %s/lit-lldb-init" % (lit.util.which('lldb', lldb_tools_dir),