diff options
author | Zachary Turner <zturner@google.com> | 2017-09-15 22:10:46 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-09-15 22:10:46 +0000 |
commit | 3144b244f7c6f8cc229118087e36f082b42fb6cf (patch) | |
tree | 96edff3452d0687cc9e3b3a1159f3006f8329f67 /test/Unit | |
parent | 76889b5ed5baef12d4f2888f7ff9fee677c940c3 (diff) |
Resubmit "[lit] Force site configs to run before source-tree configs"
This is a resubmission of r313270. It broke standalone builds of
compiler-rt because we were not correctly generating the llvm-lit
script in the standalone build directory.
The fixes incorporated here attempt to find llvm/utils/llvm-lit
from the source tree returned by llvm-config. If present, it
will generate llvm-lit into the output directory. Regardless,
the user can specify -DLLVM_EXTERNAL_LIT to point to a specific
lit.py on their file system. This supports the use case of
someone installing lit via a package manager. If it cannot find
a source tree, and -DLLVM_EXTERNAL_LIT is either unspecified or
invalid, then we print a warning that tests will not be able
to run.
Differential Revision: https://reviews.llvm.org/D37756
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@313407 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Unit')
-rw-r--r-- | test/Unit/lit.cfg | 67 |
1 files changed, 4 insertions, 63 deletions
diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 90eb2ac604..c4794ccbe5 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -17,14 +17,11 @@ config.suffixes = [] # test_source_root: The root path where tests are located. # test_exec_root: The root path where tests should be run. -clang_obj_root = getattr(config, 'clang_obj_root', None) -if clang_obj_root is not None: - config.test_exec_root = os.path.join(clang_obj_root, 'unittests') - config.test_source_root = config.test_exec_root +config.test_exec_root = os.path.join(config.clang_obj_root, 'unittests') +config.test_source_root = config.test_exec_root # testFormat: The test format to use to interpret tests. -llvm_build_mode = getattr(config, 'llvm_build_mode', "Debug") -config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests') +config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, 'Tests') # Propagate the temp directory. Windows requires this because it uses \Windows\ # if none of these are present. @@ -38,55 +35,6 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']: if symbolizer in os.environ: config.environment[symbolizer] = os.environ[symbolizer] -### - -# Check that the object root is known. -if config.test_exec_root is None: - # Otherwise, we haven't loaded the site specific configuration (the user is - # probably trying to run on a test file directly, and either the site - # configuration hasn't been created by the build system, or we are in an - # out-of-tree build situation). - - # Check for 'clang_unit_site_config' user parameter, and use that if available. - site_cfg = lit_config.params.get('clang_unit_site_config', None) - if site_cfg and os.path.exists(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 - # looking for 'llvm-config'. - # - # FIXME: I debated (i.e., wrote and threw away) adding logic to - # automagically generate the lit.site.cfg if we are in some kind of fresh - # build situation. This means knowing how to invoke the build system - # though, and I decided it was too much magic. - - llvm_config = lit.util.which('llvm-config', config.environment['PATH']) - if not llvm_config: - lit_config.fatal('No site specific configuration available!') - - # Get the source and object roots. - llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).strip() - llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).strip() - clang_src_root = os.path.join(llvm_src_root, "tools", "clang") - clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang") - - # Validate that we got a tree which points to here, using the standard - # tools/clang layout. - this_src_root = os.path.join(os.path.dirname(__file__),'..','..') - if os.path.realpath(clang_src_root) != os.path.realpath(this_src_root): - lit_config.fatal('No site specific configuration available!') - - # Check that the site specific configuration exists. - site_cfg = os.path.join(clang_obj_root, 'test', 'Unit', 'lit.site.cfg') - if not os.path.exists(site_cfg): - lit_config.fatal('No site specific configuration available!') - - # Okay, that worked. Notify the user of the automagic, and reconfigure. - lit_config.note('using out-of-tree build at %r' % clang_obj_root) - lit_config.load_config(config, site_cfg) - raise SystemExit - shlibpath_var = '' if platform.system() == 'Linux': shlibpath_var = 'LD_LIBRARY_PATH' @@ -97,14 +45,7 @@ elif platform.system() == 'Windows': # in stand-alone builds, shlibdir is clang's build tree # while llvm_libs_dir is installed LLVM (and possibly older clang) -llvm_shlib_dir = getattr(config, 'shlibdir', None) -if not llvm_shlib_dir: - lit_config.fatal('No shlibdir set!') -# Point the dynamic loader at dynamic libraries in 'lib'. -llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) -if not llvm_libs_dir: - lit_config.fatal('No LLVM libs dir set!') -shlibpath = os.path.pathsep.join((llvm_shlib_dir, llvm_libs_dir, +shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var,''))) config.environment[shlibpath_var] = shlibpath |