RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Print a message when a test failure is due to stderr output

Browse Source 
alone, rather than just an exit code.

llvm-svn: 110208
This commit is contained in:
Dan Gohman 2010-08-04 16:42:38 +00:00
parent f4c27697fc
commit 33ef8b480f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,13 +470,17 @@ def parseIntegratedTestScript(test, normalize_slashes=False):
isXFail = isExpectedFail(xfails, xtargets, test.suite.config.target_triple)
return script,isXFail,tmpBase,execdir
def formatTestOutput(status, out, err, exitCode, script):
def formatTestOutput(status, out, err, exitCode, failDueToStderr, script):
output = StringIO.StringIO()
print >>output, "Script:"
print >>output, "--"
print >>output, '\n'.join(script)
print >>output, "--"
print >>output, "Exit Code: %r" % exitCode
print >>output, "Exit Code: %r" % exitCode,
if failDueToStderr:
print >>output, "(but there was output on stderr)"
else:
print >>output
if out:
print >>output, "Command Output (stdout):"
print >>output, "--"
@ -511,8 +515,8 @@ 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.
# Test for failure. In addition to the exit code, Tcl commands are
# considered to fail if there is any standard error output.
out,err,exitCode = res
if isXFail:
ok = exitCode != 0 or err
@ -524,7 +528,11 @@ def executeTclTest(test, litConfig):
if ok:
return (status,'')
return formatTestOutput(status, out, err, exitCode, script)
# Set a flag for formatTestOutput so it can explain why the test was
# considered to have failed, despite having an exit code of 0.
failDueToStderr = exitCode == 0 and err
return formatTestOutput(status, out, err, exitCode, failDueToStderr, script)
def executeShTest(test, litConfig, useExternalSh):
if test.config.unsupported:
@ -560,4 +568,7 @@ def executeShTest(test, litConfig, useExternalSh):
if ok:
return (status,'')
return formatTestOutput(status, out, err, exitCode, script)
# Sh tests are not considered to fail just from stderr output.
failDueToStderr = False
return formatTestOutput(status, out, err, exitCode, failDueToStderr, script)