Author: hans Date: Mon Aug 13 01:13:43 2018 New Revision: 339541 URL: http://llvm.org/viewvc/llvm-project?rev=339541&view=rev Log: Merging r339073: ------------------------------------------------------------------------ r339073 | stella.stamenova | 2018-08-07 00:37:44 +0200 (Tue, 07 Aug 2018) | 14 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 change updates several configuration files which specify the path to python as a substitution and also remove quotes from existing tests. Reviewers: asmith, zturner, alexshap, jakehehrlich Reviewed By: zturner, alexshap, jakehehrlich Subscribers: mehdi_amini, nemanjai, eraman, kbarton, jakehehrlich, steven_wu, dexonsmith, stella.stamenova, delcypher, llvm-commits Differential Revision: https://reviews.llvm.org/D50206 ------------------------------------------------------------------------ Modified: llvm/branches/release_70/ (props changed) llvm/branches/release_70/test/BugPoint/compile-custom.ll llvm/branches/release_70/test/BugPoint/unsymbolized.ll llvm/branches/release_70/test/Other/opt-bisect-legacy-pass-manager.ll llvm/branches/release_70/test/TableGen/JSON.td llvm/branches/release_70/test/ThinLTO/X86/cache.ll llvm/branches/release_70/test/tools/llvm-cov/showLineExecutionCounts.cpp llvm/branches/release_70/test/tools/llvm-objcopy/auto-remove-shndx.test llvm/branches/release_70/test/tools/llvm-objcopy/many-sections.test llvm/branches/release_70/test/tools/llvm-objcopy/remove-shndx.test llvm/branches/release_70/test/tools/llvm-objcopy/strict-no-add.test llvm/branches/release_70/test/tools/llvm-symbolizer/pdb/pdb.test llvm/branches/release_70/test/tools/llvm-symbolizer/ppc64.test llvm/branches/release_70/utils/lit/lit/llvm/config.py llvm/branches/release_70/utils/lit/tests/Inputs/shtest-env/lit.cfg llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/lit.cfg llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/dev-null.txt llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/lit.cfg llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/redirects.txt llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt llvm/branches/release_70/utils/lit/tests/Inputs/shtest-timeout/lit.cfg llvm/branches/release_70/utils/lit/tests/lit.cfg Propchange: llvm/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 13 01:13:43 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,338902,338915,338968,339190,339225,339316,339319 +/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338902,338915,338968,339073,339190,339225,339316,339319 Modified: llvm/branches/release_70/test/BugPoint/compile-custom.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/BugPoint/compile-custom.ll?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/BugPoint/compile-custom.ll (original) +++ llvm/branches/release_70/test/BugPoint/compile-custom.ll Mon Aug 13 01:13:43 2018 @@ -1,4 +1,4 @@ -; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext --compile-custom --compile-command="%python %/s.py arg1 arg2" --opt-command opt --output-prefix %t %s | FileCheck %s +; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext --compile-custom --compile-command="%/s.py arg1 arg2" --opt-command opt --output-prefix %t %s | FileCheck %s ; REQUIRES: loadable_module ; Test that arguments are correctly passed in --compile-command. The output Modified: llvm/branches/release_70/test/BugPoint/unsymbolized.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/BugPoint/unsymbolized.ll?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/BugPoint/unsymbolized.ll (original) +++ llvm/branches/release_70/test/BugPoint/unsymbolized.ll Mon Aug 13 01:13:43 2018 @@ -2,7 +2,7 @@ ; RUN: echo "import sys" > %t.py ; RUN: echo "print('args = ' + str(sys.argv))" >> %t.py ; RUN: echo "exit(1)" >> %t.py -; RUN: not bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -opt-command="%python" -opt-args %t.py | FileCheck %s +; RUN: not bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -opt-command=%python -opt-args %t.py | FileCheck %s ; RUN: not --crash opt -load %llvmshlibdir/BugpointPasses%shlibext %s -bugpoint-crashcalls -disable-symbolication 2>&1 | FileCheck --check-prefix=CRASH %s ; RUN: not bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -opt-command=%t.non.existent.opt.binary -opt-args %t.py 2>&1 | FileCheck %s --check-prefix=BAD-OPT Modified: llvm/branches/release_70/test/Other/opt-bisect-legacy-pass-manager.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/Other/opt-bisect-legacy-pass-manager.ll?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/Other/opt-bisect-legacy-pass-manager.ll (original) +++ llvm/branches/release_70/test/Other/opt-bisect-legacy-pass-manager.ll Mon Aug 13 01:13:43 2018 @@ -38,7 +38,7 @@ ; utils/bisect) to locate the optimization that inlines the call to ; f2() in f3(). -; RUN: '%python' %S/opt-bisect-helper.py --start=0 --end=256 --optcmd=opt \ +; RUN: %python %S/opt-bisect-helper.py --start=0 --end=256 --optcmd=opt \ ; RUN: --filecheckcmd=FileCheck --test=%s \ ; RUN: --prefix=CHECK-BISECT-INLINE-HELPER \ ; RUN: | FileCheck %s --check-prefix=CHECK-BISECT-INLINE-RESULT Modified: llvm/branches/release_70/test/TableGen/JSON.td URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/TableGen/JSON.td?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/TableGen/JSON.td (original) +++ llvm/branches/release_70/test/TableGen/JSON.td Mon Aug 13 01:13:43 2018 @@ -1,4 +1,4 @@ -// RUN: llvm-tblgen -dump-json %s | '%python' %S/JSON-check.py %s +// RUN: llvm-tblgen -dump-json %s | %python %S/JSON-check.py %s // CHECK: data['!tablegen_json_version'] == 1 Modified: llvm/branches/release_70/test/ThinLTO/X86/cache.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/ThinLTO/X86/cache.ll?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/ThinLTO/X86/cache.ll (original) +++ llvm/branches/release_70/test/ThinLTO/X86/cache.ll Mon Aug 13 01:13:43 2018 @@ -106,11 +106,11 @@ ; RUN: rm -Rf %t.cache && mkdir %t.cache ; Create cache files with different sizes. ; Only 8B, 16B and 76B files should stay after pruning. -; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-1024', 'w') as file: file.truncate(1024)" -; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-16', 'w') as file: file.truncate(16)" -; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-8', 'w') as file: file.truncate(8)" -; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-76', 'w') as file: file.truncate(76)" -; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-77', 'w') as file: file.truncate(77)" +; RUN: %python -c "with open(r'%t.cache/llvmcache-foo-1024', 'w') as file: file.truncate(1024)" +; RUN: %python -c "with open(r'%t.cache/llvmcache-foo-16', 'w') as file: file.truncate(16)" +; RUN: %python -c "with open(r'%t.cache/llvmcache-foo-8', 'w') as file: file.truncate(8)" +; RUN: %python -c "with open(r'%t.cache/llvmcache-foo-76', 'w') as file: file.truncate(76)" +; RUN: %python -c "with open(r'%t.cache/llvmcache-foo-77', 'w') as file: file.truncate(77)" ; RUN: llvm-lto -thinlto-action=run -exported-symbol=globalfunc %t2.bc %t.bc -thinlto-cache-dir %t.cache --thinlto-cache-max-size-bytes 100 ; RUN: ls %t.cache/llvmcache-foo-16 ; RUN: ls %t.cache/llvmcache-foo-8 @@ -123,11 +123,11 @@ ; RUN: rm -Rf %t.cache && mkdir %t.cache ; Create cache files with different sizes. ; Only 8B and 16B files should stay after pruning. -; RUN: "%python" -c "print(' ' * 1023)" > %t.cache/llvmcache-foo-1024 -; RUN: "%python" -c "print(' ' * 15)" > %t.cache/llvmcache-foo-16 -; RUN: "%python" -c "print(' ' * 7)" > %t.cache/llvmcache-foo-8 -; RUN: "%python" -c "print(' ' * 75)" > %t.cache/llvmcache-foo-76 -; RUN: "%python" -c "print(' ' * 76)" > %t.cache/llvmcache-foo-77 +; RUN: %python -c "print(' ' * 1023)" > %t.cache/llvmcache-foo-1024 +; RUN: %python -c "print(' ' * 15)" > %t.cache/llvmcache-foo-16 +; RUN: %python -c "print(' ' * 7)" > %t.cache/llvmcache-foo-8 +; RUN: %python -c "print(' ' * 75)" > %t.cache/llvmcache-foo-76 +; RUN: %python -c "print(' ' * 76)" > %t.cache/llvmcache-foo-77 ; RUN: llvm-lto -thinlto-action=run -exported-symbol=globalfunc %t2.bc %t.bc -thinlto-cache-dir %t.cache --thinlto-cache-max-size-files 2 ; RUN: ls %t.cache/llvmcache-foo-16 ; RUN: ls %t.cache/llvmcache-foo-8 Modified: llvm/branches/release_70/test/tools/llvm-cov/showLineExecutionCounts.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-cov/showLineExecutionCounts.cpp?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-cov/showLineExecutionCounts.cpp (original) +++ llvm/branches/release_70/test/tools/llvm-cov/showLineExecutionCounts.cpp Mon Aug 13 01:13:43 2018 @@ -37,7 +37,7 @@ int main() { // // RUN: llvm-cov export %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -name=main 2>/dev/null > %t.export.json // RUN: FileCheck -input-file %t.export.json %S/Inputs/lineExecutionCounts.json -// RUN: cat %t.export.json | "%python" -c "import json, sys; json.loads(sys.stdin.read())" +// RUN: cat %t.export.json | %python -c "import json, sys; json.loads(sys.stdin.read())" // // RUN: llvm-cov export %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata 2>/dev/null -summary-only > %t.export-summary.json // RUN: not grep '"name":"main"' %t.export-summary.json Modified: llvm/branches/release_70/test/tools/llvm-objcopy/auto-remove-shndx.test URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-objcopy/auto-remove-shndx.test?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-objcopy/auto-remove-shndx.test (original) +++ llvm/branches/release_70/test/tools/llvm-objcopy/auto-remove-shndx.test Mon Aug 13 01:13:43 2018 @@ -1,4 +1,4 @@ -# RUN: '%python' %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t +# RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t # RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t %t2 # RUN: llvm-readobj -sections %t2 | FileCheck --check-prefix=SECS %s Modified: llvm/branches/release_70/test/tools/llvm-objcopy/many-sections.test URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-objcopy/many-sections.test?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-objcopy/many-sections.test (original) +++ llvm/branches/release_70/test/tools/llvm-objcopy/many-sections.test Mon Aug 13 01:13:43 2018 @@ -1,4 +1,4 @@ -RUN: '%python' %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t +RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t RUN: llvm-objcopy %t %t2 RUN: llvm-readobj -file-headers %t2 | FileCheck --check-prefix=EHDR %s RUN: llvm-readobj -sections %t2 | FileCheck --check-prefix=SECS %s Modified: llvm/branches/release_70/test/tools/llvm-objcopy/remove-shndx.test URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-objcopy/remove-shndx.test?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-objcopy/remove-shndx.test (original) +++ llvm/branches/release_70/test/tools/llvm-objcopy/remove-shndx.test Mon Aug 13 01:13:43 2018 @@ -1,6 +1,6 @@ # This test checks to see that a .symtab_shndx section is added to any binary # that needs it, even if the original was removed. -RUN: '%python' %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t +RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t RUN: llvm-objcopy -R .symtab_shndx %t %t2 RUN: llvm-readobj -sections %t2 | FileCheck %s Modified: llvm/branches/release_70/test/tools/llvm-objcopy/strict-no-add.test URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-objcopy/strict-no-add.test?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-objcopy/strict-no-add.test (original) +++ llvm/branches/release_70/test/tools/llvm-objcopy/strict-no-add.test Mon Aug 13 01:13:43 2018 @@ -1,7 +1,7 @@ # This test makes sure that sections added at the end that don't have symbols # defined in them don't trigger the creation of a large index table. -RUN: '%python' %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0 +RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0 RUN: cat %p/Inputs/alloc-symtab.o > %t RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t.0 %t2 RUN: llvm-objcopy -add-section=.s0=%t -add-section=.s1=%t -add-section=.s2=%t %t2 %t2 Modified: llvm/branches/release_70/test/tools/llvm-symbolizer/pdb/pdb.test URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-symbolizer/pdb/pdb.test?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-symbolizer/pdb/pdb.test (original) +++ llvm/branches/release_70/test/tools/llvm-symbolizer/pdb/pdb.test Mon Aug 13 01:13:43 2018 @@ -9,7 +9,7 @@ Subtract ImageBase from all the offsets --relative-address. RUN: grep '^ADDR:' %s | sed -s 's/ADDR: //' \ -RUN: | "%python" -c 'import sys;print("\n".join([hex(int(x, 16) - 0x400000) for x in sys.stdin]))' \ +RUN: | %python -c 'import sys;print("\n".join([hex(int(x, 16) - 0x400000) for x in sys.stdin]))' \ RUN: | llvm-symbolizer -obj="%p/Inputs/test.exe" -demangle=false --relative-address \ RUN: | FileCheck %s --check-prefix=CHECK-NO-DEMANGLE Modified: llvm/branches/release_70/test/tools/llvm-symbolizer/ppc64.test URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/llvm-symbolizer/ppc64.test?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/llvm-symbolizer/ppc64.test (original) +++ llvm/branches/release_70/test/tools/llvm-symbolizer/ppc64.test Mon Aug 13 01:13:43 2018 @@ -4,7 +4,7 @@ int foo() { return 0; } int bar() { return foo(); } int _start() { return bar(); } -RUN: "%python" -c "print('0x1000014c\n0x1000018c\n0x100001cc')" | llvm-symbolizer -obj=%p/Inputs/ppc64 | FileCheck %s +RUN: %python -c "print('0x1000014c\n0x1000018c\n0x100001cc')" | llvm-symbolizer -obj=%p/Inputs/ppc64 | FileCheck %s CHECK: foo CHECK: bar Modified: llvm/branches/release_70/utils/lit/lit/llvm/config.py URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/lit/llvm/config.py?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/lit/llvm/config.py (original) +++ llvm/branches/release_70/utils/lit/lit/llvm/config.py Mon Aug 13 01:13:43 2018 @@ -299,7 +299,8 @@ class LLVMConfig(object): 'count'), verbatim=True, unresolved='fatal'), ToolSubst(r'\| \bnot\b', command=FindTool('not'), verbatim=True, unresolved='fatal')] - self.config.substitutions.append(('%python', sys.executable)) + self.config.substitutions.append(('%python', "'%s'" % (sys.executable))) + self.add_tool_substitutions( tool_patterns, [self.config.llvm_tools_dir]) Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-env/lit.cfg URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-env/lit.cfg?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-env/lit.cfg (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-env/lit.cfg Mon Aug 13 01:13:43 2018 @@ -6,4 +6,4 @@ config.test_source_root = None config.test_exec_root = None config.environment['FOO'] = '1' config.environment['BAR'] = '2' -config.substitutions.append(('%{python}', sys.executable)) +config.substitutions.append(('%{python}', "'%s'" % (sys.executable))) Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt Mon Aug 13 01:13:43 2018 @@ -1,5 +1,5 @@ # Run a command that fails with error on stdout. # -# RUN: "%{python}" %S/write-bad-encoding.py +# RUN: %{python} %S/write-bad-encoding.py # RUN: false 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=339541&r1=339540&r2=339541&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 Mon Aug 13 01:13:43 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}', sys.executable)) +config.substitutions.append(('%{python}', "'%s'" % (sys.executable))) Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/dev-null.txt URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/dev-null.txt?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/dev-null.txt (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/dev-null.txt Mon Aug 13 01:13:43 2018 @@ -1,14 +1,14 @@ # Check handling of /dev/null in command line options # On windows, it should be redirected to a temp file. # -# RUN: "%{python}" %S/check_args.py --my_arg /dev/null | FileCheck %s --check-prefix=CHECK1 +# RUN: %{python} %S/check_args.py --my_arg /dev/null | FileCheck %s --check-prefix=CHECK1 # CHECK1: OK -# RUN: "%{python}" %S/check_args.py --my_arg=/dev/null | FileCheck %s --check-prefix=CHECK2 +# RUN: %{python} %S/check_args.py --my_arg=/dev/null | FileCheck %s --check-prefix=CHECK2 # CHECK2: OK -# RUN: "%{python}" %S/check_args.py -a /dev/null | FileCheck %s --check-prefix=CHECK3 +# RUN: %{python} %S/check_args.py -a /dev/null | FileCheck %s --check-prefix=CHECK3 # CHECK3: OK -# RUN: "%{python}" %S/check_args.py -a=/dev/null | FileCheck %s --check-prefix=CHECK4 +# RUN: %{python} %S/check_args.py -a=/dev/null | FileCheck %s --check-prefix=CHECK4 # CHECK4: OK Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/lit.cfg URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/lit.cfg?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/lit.cfg (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/lit.cfg Mon Aug 13 01:13:43 2018 @@ -4,4 +4,4 @@ config.suffixes = ['.txt'] config.test_format = lit.formats.ShTest() config.test_source_root = None config.test_exec_root = None -config.substitutions.append(('%{python}', sys.executable)) +config.substitutions.append(('%{python}', "'%s'" % (sys.executable))) Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/redirects.txt URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/redirects.txt?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/redirects.txt (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/redirects.txt Mon Aug 13 01:13:43 2018 @@ -17,13 +17,13 @@ # Check stderr redirect (2> and 2>>). # # RUN: echo "not-present" > %t.stderr-write -# RUN: "%{python}" %S/write-to-stderr.py 2> %t.stderr-write +# RUN: %{python} %S/write-to-stderr.py 2> %t.stderr-write # RUN: FileCheck --check-prefix=STDERR-WRITE < %t.stderr-write %s # # STDERR-WRITE-NOT: not-present # STDERR-WRITE: a line on stderr # -# RUN: "%{python}" %S/write-to-stderr.py 2>> %t.stderr-write +# RUN: %{python} %S/write-to-stderr.py 2>> %t.stderr-write # RUN: FileCheck --check-prefix=STDERR-APPEND < %t.stderr-write %s # # STDERR-APPEND: a line on stderr @@ -33,7 +33,7 @@ # Check combined redirect (&>). # # RUN: echo "not-present" > %t.combined -# RUN: "%{python}" %S/write-to-stdout-and-stderr.py &> %t.combined +# RUN: %{python} %S/write-to-stdout-and-stderr.py &> %t.combined # RUN: FileCheck --check-prefix=COMBINED-WRITE < %t.combined %s # # COMBINED-WRITE-NOT: not-present Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt Mon Aug 13 01:13:43 2018 @@ -2,13 +2,13 @@ # Check force remove commands success whether the file does or doesn't exist. # # RUN: rm -f %t.write -# RUN: "%{python}" %S/check_path.py file %t.write > %t.out +# RUN: %{python} %S/check_path.py file %t.write > %t.out # RUN: FileCheck --check-prefix=REMOVE-FILE < %t.out %s # RUN: echo "create a temp file" > %t.write -# RUN: "%{python}" %S/check_path.py file %t.write > %t.out +# RUN: %{python} %S/check_path.py file %t.write > %t.out # RUN: FileCheck --check-prefix=FILE-EXIST < %t.out %s # RUN: rm -f %t.write -# RUN: "%{python}" %S/check_path.py file %t.write > %t.out +# RUN: %{python} %S/check_path.py file %t.write > %t.out # RUN: FileCheck --check-prefix=REMOVE-FILE < %t.out %s # # REMOVE-FILE: False @@ -19,14 +19,14 @@ # # Check the mkdir command with -p option. # RUN: rm -f -r %T/test -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out +# RUN: %{python} %S/check_path.py dir %T/test > %t.out # RUN: FileCheck --check-prefix=REMOVE-PARENT-DIR < %t.out %s # RUN: mkdir -p %T/test -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out +# RUN: %{python} %S/check_path.py dir %T/test > %t.out # RUN: FileCheck --check-prefix=MAKE-PARENT-DIR < %t.out %s # RUN: rm -f %T/test || true # RUN: rm -f -r %T/test -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out +# RUN: %{python} %S/check_path.py dir %T/test > %t.out # RUN: FileCheck --check-prefix=REMOVE-PARENT-DIR < %t.out %s # # MAKE-PARENT-DIR: True @@ -36,13 +36,13 @@ # # RUN: rm -rf %T/test1 # RUN: mkdir %T/test1 -# RUN: "%{python}" %S/check_path.py dir %T/test1 > %t.out +# RUN: %{python} %S/check_path.py dir %T/test1 > %t.out # RUN: FileCheck --check-prefix=MAKE-DIR < %t.out %s # RUN: cd %T/test1 && mkdir foo -# RUN: "%{python}" %S/check_path.py dir %T/test1 > %t.out +# RUN: %{python} %S/check_path.py dir %T/test1 > %t.out # RUN: FileCheck --check-prefix=MAKE-DIR < %t.out %s # RUN: cd %T && rm -rf %T/test1 -# RUN: "%{python}" %S/check_path.py dir %T/test1 > %t.out +# RUN: %{python} %S/check_path.py dir %T/test1 > %t.out # RUN: FileCheck --check-prefix=REMOVE-DIR < %t.out %s # # MAKE-DIR: True @@ -52,16 +52,16 @@ # # RUN: rm -rf %T/test # RUN: mkdir -p %T/test/test1 %T/test/test2 -# RUN: "%{python}" %S/check_path.py dir %T/test %T/test/test1 %T/test/test2 > %t.out +# RUN: %{python} %S/check_path.py dir %T/test %T/test/test1 %T/test/test2 > %t.out # RUN: FileCheck --check-prefix=DIRS-EXIST < %t.out %s # RUN: mkdir %T/test || true # RUN: echo "create a temp file" > %T/test/temp.write # RUN: echo "create a temp1 file" > %T/test/test1/temp1.write # RUN: echo "create a temp2 file" > %T/test/test2/temp2.write -# RUN: "%{python}" %S/check_path.py file %T/test/temp.write %T/test/test1/temp1.write %T/test/test2/temp2.write> %t.out +# RUN: %{python} %S/check_path.py file %T/test/temp.write %T/test/test1/temp1.write %T/test/test2/temp2.write> %t.out # RUN: FileCheck --check-prefix=FILES-EXIST < %t.out %s # RUN: rm -r -f %T/* -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out +# RUN: %{python} %S/check_path.py dir %T/test > %t.out # RUN: FileCheck --check-prefix=REMOVE-ALL < %t.out %s # # DIRS-EXIST: True @@ -92,7 +92,7 @@ # RUN: mkdir -p %T/testCat # RUN: echo "abcdefgh" > %T/testCat/temp.write # RUN: cat %T/testCat/temp.write > %T/testCat/tempcat.write -# RUN: "%{python}" %S/check_path.py file %T/testCat/tempcat.write > %T/testCat/path.out +# RUN: %{python} %S/check_path.py file %T/testCat/tempcat.write > %T/testCat/path.out # RUN: FileCheck --check-prefix=FILE-EXISTS < %T/testCat/path.out %s # RUN: FileCheck --check-prefix=CAT-OUTPUT < %T/testCat/tempcat.write %s # FILE-EXISTS: True @@ -106,7 +106,7 @@ # RUN: echo "efghijkl" > %T/testCat/temp2.write # RUN: echo "mnopqrst" > %T/testCat/temp3.write # RUN: cat %T/testCat/temp1.write %T/testCat/temp2.write %T/testCat/temp3.write > %T/testCat/tempmulticat.write -# RUN: "%{python}" %S/check_path.py file %T/testCat/tempmulticat.write > %T/testCat/path.out +# RUN: %{python} %S/check_path.py file %T/testCat/tempmulticat.write > %T/testCat/path.out # RUN: FileCheck --check-prefix=MULTI-FILE-EXISTS < %T/testCat/path.out %s # RUN: FileCheck --check-prefix=MULTI-CAT-OUTPUT < %T/testCat/tempmulticat.write %s # MULTI-FILE-EXISTS: True Modified: llvm/branches/release_70/utils/lit/tests/Inputs/shtest-timeout/lit.cfg URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/Inputs/shtest-timeout/lit.cfg?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/Inputs/shtest-timeout/lit.cfg (original) +++ llvm/branches/release_70/utils/lit/tests/Inputs/shtest-timeout/lit.cfg Mon Aug 13 01:13:43 2018 @@ -29,4 +29,4 @@ config.test_exec_root = config.test_sour config.target_triple = '(unused)' src_root = os.path.join(config.test_source_root, '..') config.environment['PYTHONPATH'] = src_root -config.substitutions.append(('%{python}', sys.executable)) +config.substitutions.append(('%{python}', "'%s'" % (sys.executable))) Modified: llvm/branches/release_70/utils/lit/tests/lit.cfg URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/tests/lit.cfg?rev=339541&r1=339540&r2=339541&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/tests/lit.cfg (original) +++ llvm/branches/release_70/utils/lit/tests/lit.cfg Mon Aug 13 01:13:43 2018 @@ -40,7 +40,8 @@ config.substitutions.append(('%{inputs}' src_root, 'tests', 'Inputs'))) config.substitutions.append(('%{lit}', "%%{python} %s" % ( os.path.join(lit_path, 'lit.py'),))) -config.substitutions.append(('%{python}', sys.executable)) +config.substitutions.append(('%{python}', "'%s'" % (sys.executable))) + # Enable coverage.py reporting, assuming the coverage module has been installed # and sitecustomize.py in the virtualenv has been modified appropriately. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
