From 27c35d980a4f59ca9a4d75bf219092e6b1013dc9 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 9 Aug 2013 16:22:05 +0000 Subject: [tests] Update to use lit_config and lit package, as appropriate. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188076 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Unit/lit.cfg | 16 +++++++++------- test/Unit/lit.site.cfg.in | 8 ++++---- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'test/Unit') diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 15cf626c72..68ba0b36c4 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -4,6 +4,8 @@ import os +import lit.formats + # name: The name of this test suite. config.name = 'LLVM-Unit' @@ -43,9 +45,9 @@ if config.test_exec_root is None: # out-of-tree build situation). # Check for 'llvm_unit_site_config' user parameter, and use that if available. - site_cfg = lit.params.get('llvm_unit_site_config', None) + site_cfg = lit_config.params.get('llvm_unit_site_config', None) if site_cfg and os.path.exists(site_cfg): - lit.load_config(config, site_cfg) + lit_config.load_config(config, site_cfg) raise SystemExit # Try to detect the situation where we are using an out-of-tree build by @@ -58,7 +60,7 @@ if config.test_exec_root is None: llvm_config = lit.util.which('llvm-config', config.environment['PATH']) if not llvm_config: - lit.fatal('No site specific configuration available!') + lit_config.fatal('No site specific configuration available!') # Get the source and object roots. llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip() @@ -67,16 +69,16 @@ if config.test_exec_root is None: # Validate that we got a tree which points to here. this_src_root = os.path.join(os.path.dirname(__file__),'..','..') if os.path.realpath(llvm_src_root) != os.path.realpath(this_src_root): - lit.fatal('No site specific configuration available!') + lit_config.fatal('No site specific configuration available!') # Check that the site specific configuration exists. site_cfg = os.path.join(llvm_obj_root, 'test', 'Unit', 'lit.site.cfg') if not os.path.exists(site_cfg): - lit.fatal('No site specific configuration available!') + lit_config.fatal('No site specific configuration available!') # Okay, that worked. Notify the user of the automagic, and reconfigure. - lit.note('using out-of-tree build at %r' % llvm_obj_root) - lit.load_config(config, site_cfg) + lit_config.note('using out-of-tree build at %r' % llvm_obj_root) + lit_config.load_config(config, site_cfg) raise SystemExit # If necessary, point the dynamic loader at libLLVM.so. diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in index c6e12400d1..7ff8155dff 100644 --- a/test/Unit/lit.site.cfg.in +++ b/test/Unit/lit.site.cfg.in @@ -13,12 +13,12 @@ config.shlibpath_var = "@SHLIBPATH_VAR@" # Support substitution of the tools_dir and build_mode 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.params - config.llvm_build_mode = config.llvm_build_mode % lit.params + config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params + config.llvm_build_mode = config.llvm_build_mode % lit_config.params except KeyError: e = sys.exc_info()[1] key, = e.args - lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) + lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) # Let the main config do the real work. -lit.load_config(config, "@LLVM_SOURCE_DIR@/test/Unit/lit.cfg") +lit_config.load_config(config, "@LLVM_SOURCE_DIR@/test/Unit/lit.cfg") -- cgit v1.2.3