maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

test: bail early if tool_path is None 

tool_path will be None for llvm-go if Go cannot be found

llvm-svn: 254190
This commit is contained in:
Andrew Wilkins 2015-11-27 05:07:26 +00:00
parent 572fe6e95e
commit 522eb9c57d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/test/lit.cfg
View File

@ -236,11 +236,13 @@ def find_tool_substitution(pattern):
tool_path = lit_config.params.get(tool_name) tool_path = lit_config.params.get(tool_name)
if tool_path is None: if tool_path is None:
tool_path = lit.util.which(tool_name, llvm_tools_dir) tool_path = lit.util.which(tool_name, llvm_tools_dir)
if tool_path is None:
return tool_name, tool_path, tool_pipe
if (tool_name == "llc" and if (tool_name == "llc" and
'LLVM_ENABLE_MACHINE_VERIFIER' in os.environ and 'LLVM_ENABLE_MACHINE_VERIFIER' in os.environ and
os.environ['LLVM_ENABLE_MACHINE_VERIFIER'] == "1"): os.environ['LLVM_ENABLE_MACHINE_VERIFIER'] == "1"):
tool_path += " -verify-machineinstrs" tool_path += " -verify-machineinstrs"
if (tool_name == "llvm-go" and config.go_executable is not None): if (tool_name == "llvm-go"):
tool_path += " go=" + config.go_executable tool_path += " go=" + config.go_executable
return tool_name, tool_path, tool_pipe return tool_name, tool_path, tool_pipe