diff options
Diffstat (limited to 'test/lit.cfg.py')
| -rw-r--r-- | test/lit.cfg.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/test/lit.cfg.py b/test/lit.cfg.py index ad30988c17961..ace0b81081d36 100644 --- a/test/lit.cfg.py +++ b/test/lit.cfg.py @@ -43,6 +43,10 @@ llvm_config.use_default_substitutions() llvm_config.use_clang() +config.substitutions.append( + ('%src_include_dir', config.clang_src_dir + '/include')) + + # Propagate path to symbolizer for ASan/MSan. llvm_config.with_system_environment( ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']) @@ -59,8 +63,8 @@ tool_dirs = [config.clang_tools_dir, config.llvm_tools_dir] tools = [ 'c-index-test', 'clang-check', 'clang-diff', 'clang-format', 'clang-tblgen', 'opt', - ToolSubst('%clang_func_map', command=FindTool( - 'clang-func-mapping'), unresolved='ignore'), + ToolSubst('%clang_extdef_map', command=FindTool( + 'clang-extdef-mapping'), unresolved='ignore'), ] if config.clang_examples: @@ -71,7 +75,7 @@ llvm_config.add_tool_substitutions(tools, tool_dirs) config.substitutions.append( ('%hmaptool', "'%s' %s" % (config.python_executable, - os.path.join(config.llvm_tools_dir, 'hmaptool')))) + os.path.join(config.clang_tools_dir, 'hmaptool')))) # Plugins (loadable modules) # TODO: This should be supplied by Makefile or autoconf. @@ -137,7 +141,7 @@ if os.path.exists('/dev/fd/0') and sys.platform not in ['cygwin']: config.available_features.add('dev-fd-fs') # Not set on native MS environment. -if not re.match(r'.*-win32$', config.target_triple): +if not re.match(r'.*-(windows-msvc)$', config.target_triple): config.available_features.add('non-ms-sdk') # Not set on native PS4 environment. @@ -145,7 +149,7 @@ if not re.match(r'.*-scei-ps4', config.target_triple): config.available_features.add('non-ps4-sdk') # [PR8833] LLP64-incompatible tests -if not re.match(r'^x86_64.*-(win32|mingw32|windows-gnu)$', config.target_triple): +if not re.match(r'^x86_64.*-(windows-msvc|windows-gnu)$', config.target_triple): config.available_features.add('LP64') # [PR12920] "clang-driver" -- set if gcc driver is not used. @@ -186,3 +190,6 @@ lit.util.usePlatformSdkOnDarwin(config, lit_config) macOSSDKVersion = lit.util.findPlatformSdkVersionOnMacOS(config, lit_config) if macOSSDKVersion is not None: config.available_features.add('macos-sdk-' + macOSSDKVersion) + +if os.path.exists('/etc/gentoo-release'): + config.available_features.add('gentoo') |