lit: When running Tcl scripts via shell, try harder to find 'bash', but fall

back to running them internally if that fails. PR5240.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84462 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar
2009-10-19 03:54:21 +00:00
parent 8b828a84a0
commit 7723d45153
2 changed files with 26 additions and 2 deletions

View File

@@ -237,7 +237,9 @@ def executeTclScriptInternal(test, litConfig, tmpBase, commands, cwd):
for c in cmds[1:]:
cmd = ShUtil.Seq(cmd, '&&', c)
if litConfig.useTclAsSh:
# FIXME: This is lame, we shouldn't need bash. See PR5240.
bashPath = litConfig.getBashPath()
if litConfig.useTclAsSh and bashPath:
script = tmpBase + '.script'
# Write script file
@@ -252,7 +254,7 @@ def executeTclScriptInternal(test, litConfig, tmpBase, commands, cwd):
print >>sys.stdout
return '', '', 0
command = ['/bin/bash', script]
command = [litConfig.getBashPath(), script]
out,err,exitCode = executeCommand(command, cwd=cwd,
env=test.config.environment)