diff options
author | Zachary Turner <zturner@google.com> | 2017-11-13 23:33:29 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-11-13 23:33:29 +0000 |
commit | 89cd1926903f6242a1d949a53030f2dbc3ded195 (patch) | |
tree | 8f7c84b3d20f0961ca036af80a9fa243a3dc74c5 /utils | |
parent | 3348c6d20fa1ecdb9e52bd5cfde1b7f3c706af0d (diff) |
Revert "Update test_debuginfo.pl script to point to new tree location."
This reverts the aforementioned patch and 2 subsequent follow-ups,
as some buildbots are still failing 2 tests because of it.
Investigation is ongoing into the cause of the failures.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318112 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r-- | utils/lit/lit/llvm/config.py | 9 | ||||
-rwxr-xr-x | utils/test_debuginfo.pl | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/utils/lit/lit/llvm/config.py b/utils/lit/lit/llvm/config.py index d3d8d2288b7..798f08af1be 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( diff --git a/utils/test_debuginfo.pl b/utils/test_debuginfo.pl index d9613d73025..aaf90d95468 100755 --- a/utils/test_debuginfo.pl +++ b/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/tests/llgdb.py"; + $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/llgdb.py"; } else { $my_debugger = "gdb"; } |