[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
This commit is contained in:
Daniel Dunbar
2013-08-14 05:07:09 +00:00
parent 5403214852
commit 6b78ef3762
3 changed files with 6 additions and 3 deletions

View File

@ -1,6 +1,7 @@
# -*- Python -*- # -*- Python -*-
import os import os
import sys
import lit.formats import lit.formats
@ -29,7 +30,9 @@ config.environment['PYTHONPATH'] = src_root
config.substitutions.append(('%{src_root}', src_root)) config.substitutions.append(('%{src_root}', src_root))
config.substitutions.append(('%{inputs}', os.path.join( config.substitutions.append(('%{inputs}', os.path.join(
src_root, 'tests', 'Inputs'))) 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 # Enable coverage.py reporting, assuming the coverage module has been installed
# and sitecustomize.py in the virtualenv has been modified appropriately. # and sitecustomize.py in the virtualenv has been modified appropriately.

View File

@ -1,3 +1,3 @@
# Just run the ShUtil unit tests. # Just run the ShUtil unit tests.
# #
# RUN: python -m lit.ShUtil # RUN: %{python} -m lit.ShUtil

View File

@ -1,6 +1,6 @@
# Check the lit adaption to run under unittest. # 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 # RUN: FileCheck < %t.err %s
# #
# CHECK: unittest-adaptor :: test-one.txt ... ok # CHECK: unittest-adaptor :: test-one.txt ... ok