summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Dietz <wdietz2@illinois.edu>2013-10-17 05:33:22 +0000
committerWill Dietz <wdietz2@illinois.edu>2013-10-17 05:33:22 +0000
commit782cbdca4e926cb7b640d194531a07c431990ee3 (patch)
tree0ae56578b5167e4e00c75945df884903b62ada03
parent68c2c514f8f204401ea2bd2f6cf848022eed6802 (diff)
downloadcompiler-rt-782cbdca4e926cb7b640d194531a07c431990ee3.tar.gz
compiler-rt-782cbdca4e926cb7b640d194531a07c431990ee3.tar.bz2
compiler-rt-782cbdca4e926cb7b640d194531a07c431990ee3.tar.xz
Use configured PYTHON in asan lit tests.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@192870 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/lit_tests/lit.cfg3
-rw-r--r--lib/lit.common.configured.in1
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/asan/lit_tests/lit.cfg b/lib/asan/lit_tests/lit.cfg
index 5c129c5c..71a700c6 100644
--- a/lib/asan/lit_tests/lit.cfg
+++ b/lib/asan/lit_tests/lit.cfg
@@ -75,7 +75,8 @@ asan_source_dir = get_required_attr(config, "asan_source_dir")
asan_symbolize = os.path.join(asan_source_dir, "scripts", "asan_symbolize.py")
if not os.path.exists(asan_symbolize):
lit_config.fatal("Can't find script on path %r" % asan_symbolize)
-config.substitutions.append( ("%asan_symbolize", " " + asan_symbolize + " ") )
+python_exec = get_required_attr(config, "python_executable")
+config.substitutions.append( ("%asan_symbolize", python_exec + " " + asan_symbolize + " ") )
# Define CHECK-%os to check for OS-dependent output.
config.substitutions.append( ('CHECK-%os', ("CHECK-" + config.host_os)))
diff --git a/lib/lit.common.configured.in b/lib/lit.common.configured.in
index 9827a685..a1d2002e 100644
--- a/lib/lit.common.configured.in
+++ b/lib/lit.common.configured.in
@@ -12,6 +12,7 @@ config.compiler_rt_src_root = "@COMPILER_RT_SOURCE_DIR@"
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
config.clang = "@LLVM_BINARY_DIR@/bin/clang"
config.compiler_rt_arch = "@COMPILER_RT_SUPPORTED_ARCH@"
+config.python_executable = "@PYTHON_EXECUTABLE@"
# LLVM tools dir can be passed in lit parameters, so try to
# apply substitution.