diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2013-08-14 05:07:09 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2013-08-14 05:07:09 +0000 |
| commit | 6b78ef3762d0b48ac4493e81599be7af1491f8a6 (patch) | |
| tree | 6a5888dd58645c1472738ab9cfc6923bec4cb30a /utils/lit | |
| parent | 5403214852da123d09b91377ad0fa4543afc816c (diff) | |
| download | external_llvm-6b78ef3762d0b48ac4493e81599be7af1491f8a6.zip external_llvm-6b78ef3762d0b48ac4493e81599be7af1491f8a6.tar.gz external_llvm-6b78ef3762d0b48ac4493e81599be7af1491f8a6.tar.bz2 | |
[lit] Fix tests to execute lit with same python as invoked with.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188358 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/lit')
| -rw-r--r-- | utils/lit/tests/lit.cfg | 5 | ||||
| -rw-r--r-- | utils/lit/tests/shell-parsing.py | 2 | ||||
| -rw-r--r-- | utils/lit/tests/unittest-adaptor.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/utils/lit/tests/lit.cfg b/utils/lit/tests/lit.cfg index f148c91..a8d2591 100644 --- a/utils/lit/tests/lit.cfg +++ b/utils/lit/tests/lit.cfg @@ -1,6 +1,7 @@ # -*- Python -*- import os +import sys import lit.formats @@ -29,7 +30,9 @@ config.environment['PYTHONPATH'] = src_root config.substitutions.append(('%{src_root}', src_root)) config.substitutions.append(('%{inputs}', os.path.join( src_root, 'tests', 'Inputs'))) -config.substitutions.append(('%{lit}', os.path.join(src_root, 'lit.py'))) +config.substitutions.append(('%{lit}', "%%{python} %s" % ( + os.path.join(src_root, 'lit.py'),))) +config.substitutions.append(('%{python}', sys.executable)) # Enable coverage.py reporting, assuming the coverage module has been installed # and sitecustomize.py in the virtualenv has been modified appropriately. diff --git a/utils/lit/tests/shell-parsing.py b/utils/lit/tests/shell-parsing.py index f644132..a07e988 100644 --- a/utils/lit/tests/shell-parsing.py +++ b/utils/lit/tests/shell-parsing.py @@ -1,3 +1,3 @@ # Just run the ShUtil unit tests. # -# RUN: python -m lit.ShUtil +# RUN: %{python} -m lit.ShUtil diff --git a/utils/lit/tests/unittest-adaptor.py b/utils/lit/tests/unittest-adaptor.py index 243dd41..7435dda 100644 --- a/utils/lit/tests/unittest-adaptor.py +++ b/utils/lit/tests/unittest-adaptor.py @@ -1,6 +1,6 @@ # Check the lit adaption to run under unittest. # -# RUN: python %s %{inputs}/unittest-adaptor 2> %t.err +# RUN: %{python} %s %{inputs}/unittest-adaptor 2> %t.err # RUN: FileCheck < %t.err %s # # CHECK: unittest-adaptor :: test-one.txt ... ok |