From 75acad41bcd6cbe688e0609cbd7649ea8a533195 Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Tue, 15 Mar 2022 23:15:56 +0100 Subject: Use lit_config.substitute instead of foo % lit_config.params everywhere This mechanically applies the same changes from D121427 everywhere. Differential Revision: https://reviews.llvm.org/D121746 --- cross-project-tests/lit.site.cfg.py.in | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'cross-project-tests') diff --git a/cross-project-tests/lit.site.cfg.py.in b/cross-project-tests/lit.site.cfg.py.in index c184a600e0f3..39458dfc79af 100644 --- a/cross-project-tests/lit.site.cfg.py.in +++ b/cross-project-tests/lit.site.cfg.py.in @@ -5,9 +5,9 @@ import lit.util config.targets_to_build = "@TARGETS_TO_BUILD@".split() config.llvm_src_root = "@LLVM_SOURCE_DIR@" -config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" +config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") config.llvm_libs_dir = "@LLVM_LIBS_DIR@" -config.llvm_shlib_dir = "@SHLIBDIR@" +config.llvm_shlib_dir = lit_config.substitute("@SHLIBDIR@") config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@" config.cross_project_tests_obj_root = "@CROSS_PROJECT_TESTS_BINARY_DIR@" @@ -21,16 +21,6 @@ config.mlir_src_root = "@MLIR_SOURCE_DIR@" config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" -# Support substitution of the tools_dir with user parameters. This is -# used when we can't determine the tool dir at configuration time. -try: - config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params - config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params -except KeyError: - e = sys.exc_info()[1] - key, = e.args - lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) - import lit.llvm lit.llvm.initialize(lit_config, config) -- cgit v1.2.1