diff options
| author | Zachary Turner <zturner@google.com> | 2017-11-20 21:41:36 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-11-20 21:41:36 +0000 |
| commit | 8b6ef88e7eb618dea0160eaddecf901eb28bc2e1 (patch) | |
| tree | bd11371e1f6546d50915f368950551b7a024bff5 /llvm/utils | |
| parent | 5c774b9235d5d898171c48ed71912d7761aa491e (diff) | |
| download | bcm5719-llvm-8b6ef88e7eb618dea0160eaddecf901eb28bc2e1.tar.gz bcm5719-llvm-8b6ef88e7eb618dea0160eaddecf901eb28bc2e1.zip | |
Resubmit "Refactor debuginfo-tests" again.
This was reverted due to the tests being run twice on some
build bots. Each run had a slightly different configuration
due to the way in which it was being invoked. This fixes
the problem (albeit in a somewhat hacky way). Hopefully in
the future we can get rid of the workflow of running
debuginfo-tests as part of clang, and then this hack can
go away.
llvm-svn: 318697
Diffstat (limited to 'llvm/utils')
| -rw-r--r-- | llvm/utils/lit/lit/llvm/config.py | 9 | ||||
| -rwxr-xr-x | llvm/utils/test_debuginfo.pl | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py index c631f8b8865..261f1b3885d 100644 --- a/llvm/utils/lit/lit/llvm/config.py +++ b/llvm/utils/lit/lit/llvm/config.py @@ -27,8 +27,9 @@ 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(config.lit_tools_dir, + path = self.lit_config.getToolsPath(lit_tools_dir, config.environment['PATH'], ['cmp.exe', 'grep.exe', 'sed.exe']) if path is not None: @@ -413,8 +414,10 @@ class LLVMConfig(object): self.config.substitutions.append( ('%target_itanium_abi_host_triple', '')) - self.config.substitutions.append( - ('%src_include_dir', self.config.clang_src_dir + '/include')) + 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'))) # FIXME: Find nicer way to prohibit this. self.config.substitutions.append( diff --git a/llvm/utils/test_debuginfo.pl b/llvm/utils/test_debuginfo.pl index aaf90d95468..d9613d73025 100755 --- a/llvm/utils/test_debuginfo.pl +++ b/llvm/utils/test_debuginfo.pl @@ -56,7 +56,7 @@ my $my_debugger = $ENV{'DEBUGGER'}; if (!$my_debugger) { if ($use_lldb) { my $path = dirname(Cwd::abs_path($0)); - $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/llgdb.py"; + $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/tests/llgdb.py"; } else { $my_debugger = "gdb"; } |
