X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flit.cfg;h=323d3ce10d36615144591b25ac8bbb830277fe9c;hb=c14fb896803930ccf22d3ae6af0a013575b3b5c0;hp=128bbe927a3fe8dde4fcc2a1778383610888ff3f;hpb=fbb662f840c2f76988ff9f3f152695632cfc71be;p=oota-llvm.git diff --git a/test/lit.cfg b/test/lit.cfg index 128bbe927a3..323d3ce10d3 100644 --- a/test/lit.cfg +++ b/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,30 +17,36 @@ 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, - config.environment['PATH'], - ['cmp.exe', 'grep.exe', 'sed.exe']) + path = lit_config.getToolsPath(path, + config.environment['PATH'], + ['cmp.exe', 'grep.exe', 'sed.exe']) if path is not None: path = os.path.pathsep.join((path, config.environment['PATH'])) config.environment['PATH'] = path +# Choose between lit's internal shell pipeline runner and a real shell. If +# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override. +use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") +if use_lit_shell: + # 0 is external, "" is default, and everything else is internal. + execute_external = (use_lit_shell == "0") +else: + # Otherwise we default to internal on Windows and external elsewhere, as + # bash on Windows is usually very slow. + execute_external = (not sys.platform in ['win32']) + # testFormat: The test format to use to interpret tests. -execute_external = (not sys.platform in ['win32'] - or lit.getBashPath() not in [None, ""]) 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 actually -# set by on_clone(). -config.suffixes = [] +# 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 = ['.ll', '.c', '.cpp', '.test', '.txt', '.s'] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' # subdirectories contain auxiliary inputs for various tests in their parent # directories. -config.excludes = ['Inputs'] +config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt'] # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__) @@ -47,20 +56,11 @@ llvm_obj_root = getattr(config, 'llvm_obj_root', None) if llvm_obj_root is not None: config.test_exec_root = os.path.join(llvm_obj_root, 'test') -# Tweak the PATH to include the scripts dir, the tools dir, and the llvm-gcc bin -# dir (if available). +# Tweak the PATH to include the tools dir. if llvm_obj_root is not None: - llvm_src_root = getattr(config, 'llvm_src_root', None) - if not llvm_src_root: - lit.fatal('No LLVM source root set!') - path = os.path.pathsep.join((os.path.join(llvm_src_root, 'test', - 'Scripts'), - config.environment['PATH'])) - config.environment['PATH'] = path - 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 @@ -90,6 +90,16 @@ config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '') config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable', '') +# Propagate path to symbolizer for ASan/MSan. +for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']: + if symbolizer in os.environ: + config.environment[symbolizer] = os.environ[symbolizer] + +# Propagate options for sanitizers. +for options in ['ASAN_OPTIONS', 'UBSAN_OPTIONS']: + if options in os.environ: + config.environment[options] = os.environ[options] + ### import os @@ -102,9 +112,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 @@ -117,7 +127,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() @@ -126,61 +136,42 @@ 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 ### -# Provide a command line for mcjit tests -lli_mcjit = 'lli -use-mcjit' +lli = 'lli' # The target triple used by default by lli is the process target triple (some # triple appropriate for generating code for the current process) but because # we don't support COFF in MCJIT well enough for the tests, force ELF format on # Windows. FIXME: the process target triple should be used here, but this is # difficult to obtain on Windows. if re.search(r'cygwin|mingw32|win32', config.host_triple): - lli_mcjit += ' -mtriple='+config.host_triple+'-elf' -config.substitutions.append( ('%lli_mcjit', lli_mcjit) ) - -# Provide a substition for those tests that need to run the jit to obtain data -# but simply want use the currently considered most reliable jit for platform -# FIXME: ppc32 is not ready for mcjit. -if 'arm' in config.target_triple \ - or 'powerpc64' in config.target_triple: - defaultIsMCJIT = 'true' -else: - defaultIsMCJIT = 'false' -config.substitutions.append( ('%defaultjit', '-use-mcjit='+defaultIsMCJIT) ) - -# Process jit implementation option -jit_impl_cfg = lit.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 - if 'i686' in config.target_triple: - config.target_triple += jit_impl_cfg + '-ia32' - elif 'x86_64' in config.target_triple: - config.target_triple += jit_impl_cfg + '-ia64' - else: - config.target_triple += jit_impl_cfg - - config.substitutions.append( ('%lli', 'lli -use-mcjit') ) -else: - config.substitutions.append( ('%lli', 'lli') ) + lli += ' -mtriple='+config.host_triple+'-elf' +config.substitutions.append( ('%lli', lli ) ) + +# Similarly, have a macro to use llc with DWARF even when the host is win32. +llc_dwarf = 'llc' +if re.search(r'win32', config.target_triple): + llc_dwarf += ' -mtriple='+config.target_triple.replace('-win32', '-mingw32') +config.substitutions.append( ('%llc_dwarf', llc_dwarf) ) # Add site-specific substitutions. config.substitutions.append( ('%ocamlopt', config.ocamlopt_executable) ) config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) +config.substitutions.append( ('%exeext', config.llvm_exe_ext) ) +config.substitutions.append( ('%python', config.python_executable) ) # For each occurrence of an llvm tool name as its own word, replace it # with the full path to the build directory holding that tool. This @@ -188,56 +179,79 @@ config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) # tools that might happen to be in the user's PATH. Thus this list # includes every tool placed in $(LLVM_OBJ_ROOT)/$(BuildMode)/bin # (llvm_tools_dir in lit parlance). - # Don't match 'bugpoint-' or 'clang-'. - # Don't match '/clang' or '-clang'. -if os.pathsep == ';': - pathext = os.environ.get('PATHEXT', '').split(';') -else: - pathext = [''] -for pattern in [r"\bbugpoint\b(?!-)", r"(?