diff options
| author | Zachary Turner <zturner@google.com> | 2017-11-21 01:20:28 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-11-21 01:20:28 +0000 |
| commit | 7480dbd812d251e1a4bbc52ccde153098b5fb5de (patch) | |
| tree | f2787ed050b510556a2d690316a885447efcb3a5 /utils/lit | |
| parent | ed677fa0892ab5730a1bb7d67e46bdb7e8d54e20 (diff) | |
Re-revert "Refactor debuginfo-tests."
This is still breaking greendragon.
At this point I give up until someone can fix the greendragon
bots, and I will probably abandon this effort in favor of using
a private github repository.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318722 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/lit')
| -rw-r--r-- | utils/lit/lit/llvm/config.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/utils/lit/lit/llvm/config.py b/utils/lit/lit/llvm/config.py index 261f1b3885d..c631f8b8865 100644 --- a/utils/lit/lit/llvm/config.py +++ b/utils/lit/lit/llvm/config.py @@ -27,9 +27,8 @@ class LLVMConfig(object): # For tests that require Windows to run. features.add('system-windows') - lit_tools_dir = getattr(config, 'lit_tools_dir', None) # Seek sane tools in directories and set to $PATH. - path = self.lit_config.getToolsPath(lit_tools_dir, + path = self.lit_config.getToolsPath(config.lit_tools_dir, config.environment['PATH'], ['cmp.exe', 'grep.exe', 'sed.exe']) if path is not None: @@ -414,10 +413,8 @@ class LLVMConfig(object): self.config.substitutions.append( ('%target_itanium_abi_host_triple', '')) - clang_src_dir = getattr(self.config, 'clang_src_dir', None) - if clang_src_dir: - self.config.substitutions.append( - ('%src_include_dir', os.path.join(clang_src_dir, 'include'))) + self.config.substitutions.append( + ('%src_include_dir', self.config.clang_src_dir + '/include')) # FIXME: Find nicer way to prohibit this. self.config.substitutions.append( |