mirror of
https://github.com/RPCS3/llvm.git
synced 2024-11-24 04:09:47 +00:00
[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
This commit is contained in:
Daniel Dunbar
parent
b0e8d37240
commit
27c35d980a
@ -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.
|
||||
|
||||
@ -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")
|
||||
|
||||
33
test/lit.cfg
33
test/lit.cfg
@ -7,6 +7,9 @@ import sys
|
||||
import re
|
||||
import platform
|
||||
|
||||
import lit.util
|
||||
import lit.formats
|
||||
|
||||
# name: The name of this test suite.
|
||||
config.name = 'LLVM'
|
||||
|
||||
@ -14,7 +17,7 @@ config.name = 'LLVM'
|
||||
if sys.platform in ['win32']:
|
||||
# Seek sane tools in directories and set to $PATH.
|
||||
path = getattr(config, 'lit_tools_dir', None)
|
||||
path = lit.getToolsPath(path,
|
||||
path = lit_config.getToolsPath(path,
|
||||
config.environment['PATH'],
|
||||
['cmp.exe', 'grep.exe', 'sed.exe'])
|
||||
if path is not None:
|
||||
@ -36,9 +39,6 @@ else:
|
||||
# testFormat: The test format to use to interpret tests.
|
||||
config.test_format = lit.formats.ShTest(execute_external)
|
||||
|
||||
# To ignore test output on stderr so it doesn't trigger failures uncomment this:
|
||||
#config.test_format = lit.formats.TclTest(ignoreStdErr=True)
|
||||
|
||||
# suffixes: A list of file extensions to treat as test files. This is overriden
|
||||
# by individual lit.local.cfg files in the test subdirectories.
|
||||
config.suffixes = []
|
||||
@ -60,7 +60,7 @@ if llvm_obj_root is not None:
|
||||
if llvm_obj_root is not None:
|
||||
llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
|
||||
if not llvm_tools_dir:
|
||||
lit.fatal('No LLVM tools dir set!')
|
||||
lit_config.fatal('No LLVM tools dir set!')
|
||||
path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
|
||||
config.environment['PATH'] = path
|
||||
|
||||
@ -107,9 +107,9 @@ if config.test_exec_root is None:
|
||||
# out-of-tree build situation).
|
||||
|
||||
# Check for 'llvm_site_config' user parameter, and use that if available.
|
||||
site_cfg = lit.params.get('llvm_site_config', None)
|
||||
site_cfg = lit_config.params.get('llvm_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
|
||||
@ -122,7 +122,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()
|
||||
@ -131,16 +131,16 @@ if config.test_exec_root is None:
|
||||
# Validate that we got a tree which points to here.
|
||||
this_src_root = os.path.dirname(config.test_source_root)
|
||||
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', '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
|
||||
|
||||
###
|
||||
@ -169,7 +169,7 @@ else:
|
||||
config.substitutions.append( ('%defaultjit', '-use-mcjit='+defaultIsMCJIT) )
|
||||
|
||||
# Process jit implementation option
|
||||
jit_impl_cfg = lit.params.get('jit_impl', None)
|
||||
jit_impl_cfg = lit_config.params.get('jit_impl', None)
|
||||
if jit_impl_cfg == 'mcjit':
|
||||
# When running with mcjit, mangle -mcjit into target triple
|
||||
# and add -use-mcjit flag to lli invocation
|
||||
@ -292,21 +292,22 @@ if re.search(r'with assertions', llc_cmd.stdout.read().decode('ascii')):
|
||||
llc_cmd.wait()
|
||||
|
||||
# Check if we should use gmalloc.
|
||||
use_gmalloc_str = lit.params.get('use_gmalloc', None)
|
||||
use_gmalloc_str = lit_config.params.get('use_gmalloc', None)
|
||||
if use_gmalloc_str is not None:
|
||||
if use_gmalloc_str.lower() in ('1', 'true'):
|
||||
use_gmalloc = True
|
||||
elif use_gmalloc_str.lower() in ('', '0', 'false'):
|
||||
use_gmalloc = False
|
||||
else:
|
||||
lit.fatal('user parameter use_gmalloc should be 0 or 1')
|
||||
lit_config.fatal('user parameter use_gmalloc should be 0 or 1')
|
||||
else:
|
||||
# Default to not using gmalloc
|
||||
use_gmalloc = False
|
||||
|
||||
# Allow use of an explicit path for gmalloc library.
|
||||
# Will default to '/usr/lib/libgmalloc.dylib' if not set.
|
||||
gmalloc_path_str = lit.params.get('gmalloc_path', '/usr/lib/libgmalloc.dylib')
|
||||
gmalloc_path_str = lit_config.params.get('gmalloc_path',
|
||||
'/usr/lib/libgmalloc.dylib')
|
||||
|
||||
if use_gmalloc:
|
||||
config.environment.update({'DYLD_INSERT_LIBRARIES' : gmalloc_path_str})
|
||||
|
||||
@ -26,11 +26,11 @@ config.have_zlib = "@HAVE_LIBZ@"
|
||||
# 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.params
|
||||
config.llvm_tools_dir = config.llvm_tools_dir % 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/lit.cfg")
|
||||
lit_config.load_config(config, "@LLVM_SOURCE_DIR@/test/lit.cfg")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user