[llvm] r188358 - [lit] Fix tests to execute lit with same python as invoked with.

[Daniel Dunbar]

Author: ddunbar
Date: Wed Aug 14 00:07:09 2013
New Revision: 188358

URL: http://llvm.org/viewvc/llvm-project?rev=188358&view=rev
Log:
[lit] Fix tests to execute lit with same python as invoked with.

Modified:
    llvm/trunk/utils/lit/tests/lit.cfg
    llvm/trunk/utils/lit/tests/shell-parsing.py
    llvm/trunk/utils/lit/tests/unittest-adaptor.py

Modified: llvm/trunk/utils/lit/tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/lit.cfg?rev=188358&r1=188357&r2=188358&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/lit.cfg (original)
+++ llvm/trunk/utils/lit/tests/lit.cfg Wed Aug 14 00:07:09 2013
@@ -1,6 +1,7 @@
 # -*- Python -*-
 
 import os
+import sys
 
 import lit.formats
 
@@ -29,7 +30,9 @@ config.environment['PYTHONPATH'] = src_r
 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.

Modified: llvm/trunk/utils/lit/tests/shell-parsing.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shell-parsing.py?rev=188358&r1=188357&r2=188358&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/shell-parsing.py (original)
+++ llvm/trunk/utils/lit/tests/shell-parsing.py Wed Aug 14 00:07:09 2013
@@ -1,3 +1,3 @@
 # Just run the ShUtil unit tests.
 #
-# RUN: python -m lit.ShUtil
+# RUN: %{python} -m lit.ShUtil

Modified: llvm/trunk/utils/lit/tests/unittest-adaptor.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/unittest-adaptor.py?rev=188358&r1=188357&r2=188358&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/unittest-adaptor.py (original)
+++ llvm/trunk/utils/lit/tests/unittest-adaptor.py Wed Aug 14 00:07:09 2013
@@ -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