From 782cbdca4e926cb7b640d194531a07c431990ee3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 17 Oct 2013 05:33:22 +0000 Subject: 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 --- lib/asan/lit_tests/lit.cfg | 3 ++- lib/lit.common.configured.in | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3