[llvm-branch-commits] [lldb] r322832 - Merging r321932:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 18 03:11:43 2018
New Revision: 322832

URL: http://llvm.org/viewvc/llvm-project?rev=322832&view=rev
Log:
Merging r321932:
------------------------------------------------------------------------
r321932 | mgorny | 2018-01-06 02:20:25 -0800 (Sat, 06 Jan 2018) | 12 lines

[test] Use full PATH lookup for tools

Use full PATH when looking up test tools rather than just llvm tools
directory. r320813 has added a lookup for 'lldb-test' which is part
of LLDB tools rather than LLVM, and therefore is not present
in llvm_tools_dir before LLDB is installed.

While technically we could introduce separate per-directory lookup
logic, there is no real reason not to use the PATH formed earlier here,
and this is what other tools are doing.

Differential Revision: https://reviews.llvm.org/D41726
------------------------------------------------------------------------

Modified:
    lldb/branches/release_60/   (props changed)
    lldb/branches/release_60/lit/lit.cfg

Propchange: lldb/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 18 03:11:43 2018
@@ -1,2 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
+/lldb/trunk:321932

Modified: lldb/branches/release_60/lit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_60/lit/lit.cfg?rev=322832&r1=322831&r2=322832&view=diff
==============================================================================
--- lldb/branches/release_60/lit/lit.cfg (original)
+++ lldb/branches/release_60/lit/lit.cfg Thu Jan 18 03:11:43 2018
@@ -91,11 +91,11 @@ for pattern in [r"\bFileCheck\b",
                           pattern)
     tool_pipe = tool_match.group(2)
     tool_name = tool_match.group(4)
-    tool_path = lit.util.which(tool_name, config.llvm_tools_dir)
+    tool_path = lit.util.which(tool_name, config.environment['PATH'])
     if not tool_path:
         # Warn, but still provide a substitution.
         lit_config.note(
-            'Did not find ' + tool_name + ' in ' + config.llvm_tools_dir)
+            'Did not find ' + tool_name + ' in ' + config.environment['PATH'])
     config.substitutions.append((pattern, tool_pipe + tool_path))
 
 # Shell execution