Author: zturner Date: Thu Sep 14 09:47:58 2017 New Revision: 313270 URL: http://llvm.org/viewvc/llvm-project?rev=313270&view=rev Log: [lit] Force site configs to be run before source-tree configs
This patch simplifies LLVM's lit infrastructure by enforcing an ordering that a site config is always run before a source-tree config. A significant amount of the complexity from lit config files arises from the fact that inside of a source-tree config file, we don't yet know if the site config has been run. However it is *always* required to run a site config first, because it passes various variables down through CMake that the main config depends on. As a result, every config file has to do a bunch of magic to try to reverse-engineer the location of the site config file if they detect (heuristically) that the site config file has not yet been run. This patch solves the problem by emitting a mapping from source tree config file to binary tree site config file in llvm-lit.py. Then, during discovery when we find a config file, we check to see if we have a target mapping for it, and if so we use that instead. This mechanism is generic enough that it does not affect external users of lit. They will just not have a config mapping defined, and everything will work as normal. On the other hand, for us it allows us to make many simplifications: * We are guaranteed that a site config will be executed first * Inside of a main config, we no longer have to assume that attributes might not be present and use getattr everywhere. * We no longer have to pass parameters such as --param llvm_site_config=<path> on the command line. * It is future-proof, meaning you don't have to edit llvm-lit.in to add support for new projects. * All of the duplicated logic of trying various fallback mechanisms of finding a site config from the main config are now gone. One potentially noteworthy thing that was required to implement this change is that whereas the ninja check targets previously used the first method to spawn lit, they now use the second. In particular, you can no longer run lit.py against the source tree while specifying the various `foo_site_config=<path>` parameters. Instead, you need to run llvm-lit.py. Differential Revision: https://reviews.llvm.org/D37756 Modified: clang-tools-extra/trunk/test/Unit/lit.cfg clang-tools-extra/trunk/test/lit.cfg Modified: clang-tools-extra/trunk/test/Unit/lit.cfg URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/Unit/lit.cfg?rev=313270&r1=313269&r2=313270&view=diff ============================================================================== --- clang-tools-extra/trunk/test/Unit/lit.cfg (original) +++ clang-tools-extra/trunk/test/Unit/lit.cfg Thu Sep 14 09:47:58 2017 @@ -9,10 +9,9 @@ config.suffixes = [] # Seems not to matt # Test Source and Exec root dirs both point to the same directory where google # test binaries are built. -extra_tools_obj_dir = getattr(config, 'extra_tools_obj_dir', None) -if extra_tools_obj_dir is not None: - config.test_source_root = extra_tools_obj_dir - config.test_exec_root = config.test_source_root + +config.test_source_root = config.extra_tools_obj_dir +config.test_exec_root = config.test_source_root # All GoogleTests are named to have 'Tests' as their suffix. The '.' option is # a special value for GoogleTest indicating that it should look through the @@ -20,18 +19,6 @@ if extra_tools_obj_dir is not None: # ;-separated list of subdirectories). config.test_format = lit.formats.GoogleTest('.', 'Tests') -# If the site-specific configuration wasn't loaded (e.g. the build system failed -# to create it or the user is running a test file directly) try to come up with -# sane config options. -if config.test_exec_root is None: - # Look for a --param=extra_tools_unit_site_config option. - site_cfg = lit_config.params.get('extra_tools_unit_site_config', None) - if site_cfg and os.path.exists(site_cfg): - lit_config.load_config(config, site_cfg) - raise SystemExit - - # FIXME: Support out-of-tree builds? See clang/test/Unit/lit.cfg if we care. - shlibpath_var = '' if platform.system() == 'Linux': shlibpath_var = 'LD_LIBRARY_PATH' @@ -41,17 +28,11 @@ elif platform.system() == 'Windows': shlibpath_var = 'PATH' # Point the dynamic loader at dynamic libraries in 'lib'. -shlibdir = getattr(config, 'shlibdir', None) -if not shlibdir: - lit_config.fatal('No shlibdir set!') -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((shlibdir, llvm_libs_dir, +shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir, config.environment.get(shlibpath_var,''))) # Win32 seeks DLLs along %PATH%. if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir): - shlibpath = os.path.pathsep.join((shlibdir, shlibpath)) + shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath)) config.environment[shlibpath_var] = shlibpath Modified: clang-tools-extra/trunk/test/lit.cfg URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/lit.cfg?rev=313270&r1=313269&r2=313270&view=diff ============================================================================== --- clang-tools-extra/trunk/test/lit.cfg (original) +++ clang-tools-extra/trunk/test/lit.cfg Thu Sep 14 09:47:58 2017 @@ -54,9 +54,7 @@ config.excludes = ['Inputs'] config.test_source_root = os.path.dirname(__file__) # test_exec_root: The root path where tests should be run. -clang_tools_binary_dir = getattr(config, 'clang_tools_binary_dir', None) -if clang_tools_binary_dir is not None: - config.test_exec_root = os.path.join(clang_tools_binary_dir, 'test') +config.test_exec_root = os.path.join(config.clang_tools_binary_dir, 'test') # Clear some environment variables that might affect Clang. # @@ -88,92 +86,19 @@ for name in possibly_dangerous_env_vars: del config.environment[name] # Tweak the PATH to include the tools dir and the scripts dir. -if clang_tools_binary_dir is not None: - clang_tools_dir = getattr(config, 'clang_tools_dir', None) - if not clang_tools_dir: - lit_config.fatal('No Clang 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(( - clang_tools_dir, llvm_tools_dir, config.environment['PATH'])) - config.environment['PATH'] = path - - clang_libs_dir = getattr(config, 'clang_libs_dir', None) - if not clang_libs_dir: - lit_config.fatal('No Clang 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((clang_libs_dir, llvm_libs_dir, - config.environment.get('LD_LIBRARY_PATH',''))) - config.environment['LD_LIBRARY_PATH'] = path - -### - -# 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_site_config' user parameter, and use that if available. - site_cfg = lit_config.params.get('clang_tools_extra_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 = lit.util.capture(['llvm-config', '--src-root']).strip() - llvm_obj_root = lit.util.capture(['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") - - clang_tools_extra_src_root = os.path.join(clang_src_root, "tools", "extra") - clang_tools_extra_obj_root = os.path.join(clang_obj_root, "tools", "extra") - # Validate that we got a tree which points to here, using the standard - # tools/clang layout. - this_src_root = os.path.dirname(config.test_source_root) - if os.path.realpath(clang_tools_extra_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_tools_extra_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 Clang build directory.') - - # 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 - -### - -import os +path = os.path.pathsep.join(( + config.clang_tools_dir, config.llvm_tools_dir, config.environment['PATH'])) +config.environment['PATH'] = path + +path = os.path.pathsep.join((config.clang_libs_dir, config.llvm_libs_dir, + config.environment.get('LD_LIBRARY_PATH',''))) +config.environment['LD_LIBRARY_PATH'] = path # When running under valgrind, we mangle '-vg' onto the end of the triple so we # can check it with XFAIL and XTARGET. if lit_config.useValgrind: config.target_triple += '-vg' -### - # Set available features we allow tests to conditionalize on. # # As of 2011.08, crash-recovery tests still do not pass on FreeBSD. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
