RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-28 22:20:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the logic which interprets output on stderr as an error so that

Browse Source 
it doesn't modify the exit code or the stdout contents, and so that it
doesn't clutter the output with "Command has output on stderr!".


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110171 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2010-08-04 00:12:31 +00:00
parent 67b453b0d1
commit e1e5746476
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/lit/lit/TestRunner.py
View File

@ -312,11 +312,6 @@ def executeTclScriptInternal(test, litConfig, tmpBase, commands, cwd):
out,err,exitCode = executeCommand(command, cwd=cwd,
env=test.config.environment)
# Tcl commands fail on standard error output.
if err:
exitCode = 1
out = 'Command has output on stderr!\n\n' + out
return out,err,exitCode
else:
results = []
@ -328,11 +323,6 @@ def executeTclScriptInternal(test, litConfig, tmpBase, commands, cwd):
out = err = ''
# Tcl commands fail on standard error output.
if [True for _,_,err,res in results if err]:
exitCode = 1
out += 'Command has output on stderr!\n\n'
for i,(cmd, cmd_out, cmd_err, res) in enumerate(results):
out += 'Command %d: %s\n' % (i, ' '.join('"%s"' % s for s in cmd.args))
out += 'Command %d Result: %r\n' % (i, res)
@ -521,12 +511,14 @@ def executeTclTest(test, litConfig):
if len(res) == 2:
return res
# Test for failure. In addition to the exit code, Tcl commands fail
# if there is any standard error output.
out,err,exitCode = res
if isXFail:
ok = exitCode != 0
ok = exitCode != 0 or err
status = Test.XFAIL if ok else Test.XPASS
else:
ok = exitCode == 0
ok = exitCode == 0 and not err
status = Test.PASS if ok else Test.FAIL
if ok: