Author: zturner Date: Fri Sep 15 15:10:46 2017 New Revision: 313407 URL: http://llvm.org/viewvc/llvm-project?rev=313407&view=rev Log: 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 Modified: lldb/trunk/lit/Unit/lit.cfg lldb/trunk/lit/lit.cfg Modified: lldb/trunk/lit/Unit/lit.cfg URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Unit/lit.cfg?rev=313407&r1=313406&r2=313407&view=diff ============================================================================== --- lldb/trunk/lit/Unit/lit.cfg (original) +++ lldb/trunk/lit/Unit/lit.cfg Fri Sep 15 15:10:46 2017 @@ -6,19 +6,6 @@ import os import lit.formats -# 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 'llvm_unit_site_config' user parameter, and use that if available. - site_cfg = lit_config.params.get('lldb_unit_site_config', None) - if site_cfg and os.path.exists(site_cfg): - lit_config.load_config(config, site_cfg) - raise SystemExit - # name: The name of this test suite. config.name = 'lldb-Unit' @@ -31,6 +18,4 @@ config.test_source_root = os.path.join(c config.test_exec_root = config.test_source_root # testFormat: The test format to use to interpret tests. -if not hasattr(config, 'llvm_build_mode'): - lit_config.fatal("unable to find llvm_build_mode value on config") config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, 'Tests') Modified: lldb/trunk/lit/lit.cfg URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit.cfg?rev=313407&r1=313406&r2=313407&view=diff ============================================================================== --- lldb/trunk/lit/lit.cfg (original) +++ lldb/trunk/lit/lit.cfg Fri Sep 15 15:10:46 2017 @@ -29,94 +29,24 @@ config.suffixes = [] config.test_source_root = os.path.dirname(__file__) # test_exec_root: The root path where tests should be run. -lldb_obj_root = getattr(config, 'lldb_obj_root', None) -if lldb_obj_root is not None: - config.test_exec_root = os.path.join(lldb_obj_root, 'lit') - -# Set llvm_{src,obj}_root for use by others. -config.llvm_src_root = getattr(config, 'llvm_src_root', None) -config.llvm_obj_root = getattr(config, 'llvm_obj_root', None) +config.test_exec_root = os.path.join(config.lldb_obj_root, 'lit') # Tweak the PATH to include the tools dir and the scripts dir. -if lldb_obj_root is not None: - lldb_tools_dir = getattr(config, 'lldb_tools_dir', None) - if not lldb_tools_dir: - lit_config.fatal('No LLDB tools dir set!') - llvm_tools_dir = getattr(config, 'llvm_tools_dir', None) - if not llvm_tools_dir: - lit_config.fatal('No LLVM tools dir set!') - path = os.path.pathsep.join((lldb_tools_dir, llvm_tools_dir, config.environment['PATH'])) - path = os.path.pathsep.join((os.path.join(getattr(config, 'llvm_src_root', None),'test','Scripts'),path)) - - config.environment['PATH'] = path - - lldb_libs_dir = getattr(config, 'lldb_libs_dir', None) - if not lldb_libs_dir: - lit_config.fatal('No LLDB libs dir set!') - llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) - if not llvm_libs_dir: - lit_config.fatal('No LLVM libs dir set!') - path = os.path.pathsep.join((lldb_libs_dir, llvm_libs_dir, - config.environment.get('LD_LIBRARY_PATH',''))) - config.environment['LD_LIBRARY_PATH'] = path - - # Propagate LLVM_SRC_ROOT into the environment. - config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '') - - # Propagate PYTHON_EXECUTABLE into the environment - config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable', - '') -### - -# 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 'lldb_site_config' user parameter, and use that if available. - site_cfg = lit_config.params.get('lldb_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. We should solve this by just having - # the .cfg files generated during the configuration step. - - 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() - lldb_src_root = os.path.join(llvm_src_root, "tools", "lldb") - lldb_obj_root = os.path.join(llvm_obj_root, "tools", "lldb") - - # Validate that we got a tree which points to here, using the standard - # tools/lldb layout. - this_src_root = os.path.dirname(config.test_source_root) - if os.path.realpath(lldb_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(lldb_obj_root, 'test', 'lit.site.cfg') - if not os.path.exists(site_cfg): - lit_config.fatal( - 'No site specific configuration available! You may need to ' - 'run "make test" in your lldb build directory.') - - # Okay, that worked. Notify the user of the automagic, and reconfigure. - lit_config.note('using out-of-tree build at %r' % lldb_obj_root) - lit_config.load_config(config, site_cfg) - raise SystemExit +lldb_tools_dir = config.lldb_tools_dir +llvm_tools_dir = config.llvm_tools_dir +path = os.path.pathsep.join((config.lldb_tools_dir, config.llvm_tools_dir, config.environment['PATH'])) + +config.environment['PATH'] = path + +path = os.path.pathsep.join((config.lldb_libs_dir, config.llvm_libs_dir, + config.environment.get('LD_LIBRARY_PATH',''))) +config.environment['LD_LIBRARY_PATH'] = path + +# Propagate LLVM_SRC_ROOT into the environment. +config.environment['LLVM_SRC_ROOT'] = getattr(config, 'llvm_src_root', '') + +# Propagate PYTHON_EXECUTABLE into the environment +config.environment['PYTHON_EXECUTABLE'] = getattr(config, 'python_executable', '') # Register substitutions config.substitutions.append(('%python', config.python_executable)) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits