[llvm-branch-commits] [lld] r339656 - Merging r339075:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 14 01:49:47 2018
New Revision: 339656

URL: http://llvm.org/viewvc/llvm-project?rev=339656&view=rev
Log:
Merging r339075:
------------------------------------------------------------------------
r339075 | stella.stamenova | 2018-08-07 00:37:49 +0200 (Tue, 07 Aug 2018) | 12 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, espindola

Subscribers: emaste, sbc100, arichardson, aheejin, steven_wu, dexonsmith, llvm-commits

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

Modified:
    lld/branches/release_70/   (props changed)
    lld/branches/release_70/test/ELF/lto/cache.ll
    lld/branches/release_70/test/mach-o/dependency_info.yaml
    lld/branches/release_70/test/wasm/lto/cache.ll

Propchange: lld/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 14 01:49:47 2018
@@ -1 +1 @@
-/lld/trunk:338679,338684,338697,338699,339058
+/lld/trunk:338679,338684,338697,338699,339058,339075

Modified: lld/branches/release_70/test/ELF/lto/cache.ll
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/lto/cache.ll?rev=339656&r1=339655&r2=339656&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/lto/cache.ll (original)
+++ lld/branches/release_70/test/ELF/lto/cache.ll Tue Aug 14 01:49:47 2018
@@ -13,7 +13,7 @@
 ; RUN: ls %t.cache | count 4
 
 ; Create a file of size 64KB.
-; RUN: "%python" -c "print(' ' * 65536)" > %t.cache/llvmcache-foo
+; RUN: %python -c "print(' ' * 65536)" > %t.cache/llvmcache-foo
 
 ; This should leave the file in place.
 ; RUN: ld.lld --thinlto-cache-dir=%t.cache --thinlto-cache-policy cache_size_bytes=128k:prune_interval=0s -o %t3 %t2.o %t.o

Modified: lld/branches/release_70/test/mach-o/dependency_info.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/mach-o/dependency_info.yaml?rev=339656&r1=339655&r2=339656&view=diff
==============================================================================
--- lld/branches/release_70/test/mach-o/dependency_info.yaml (original)
+++ lld/branches/release_70/test/mach-o/dependency_info.yaml Tue Aug 14 01:49:47 2018
@@ -9,7 +9,7 @@
 # RUN:        -F/Custom/Frameworks \
 # RUN:        -framework Bar \
 # RUN:        -framework Foo
-# RUN: '%python' %p/Inputs/DependencyDump.py %t.info | FileCheck %s
+# RUN: %python %p/Inputs/DependencyDump.py %t.info | FileCheck %s
 
 
 # CHECK: linker-vers: lld

Modified: lld/branches/release_70/test/wasm/lto/cache.ll
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/wasm/lto/cache.ll?rev=339656&r1=339655&r2=339656&view=diff
==============================================================================
--- lld/branches/release_70/test/wasm/lto/cache.ll (original)
+++ lld/branches/release_70/test/wasm/lto/cache.ll Tue Aug 14 01:49:47 2018
@@ -11,7 +11,7 @@
 ; RUN: ls %t.cache | count 4
 
 ; Create a file of size 64KB.
-; RUN: "%python" -c "print(' ' * 65536)" > %t.cache/llvmcache-foo
+; RUN: %python -c "print(' ' * 65536)" > %t.cache/llvmcache-foo
 
 ; This should leave the file in place.
 ; RUN: wasm-ld --thinlto-cache-dir=%t.cache --thinlto-cache-policy cache_size_bytes=128k:prune_interval=0s -o %t.wasm %t2.o %t.o