Skip to content

Commit

Permalink
[lit] Only gather redirected files for command failures.
Browse files Browse the repository at this point in the history
 - The intended use of this was just in diagnostics, so we shouldn't pay the
   cost of reading these all the time.

 - This will avoid including the full output of each command in tests which
   fail, but the most important use case for this was to gather the output of
   the specific command which failed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@272365 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
ddunbar committed Jun 10, 2016
1 parent f67ce49 commit 434c834
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions utils/lit/lit/TestRunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,17 +396,18 @@ def to_string(bytes):
except:
err = str(err)

# Gather the redirected output files.
# Gather the redirected output files for failed commands.
output_files = []
for (name, mode, f, path) in sorted(opened_files):
if path is not None and mode in ('w', 'a'):
try:
with open(path, 'rb') as f:
data = f.read()
except:
data = None
if data != None:
output_files.append((name, path, data))
if res != 0:
for (name, mode, f, path) in sorted(opened_files):
if path is not None and mode in ('w', 'a'):
try:
with open(path, 'rb') as f:
data = f.read()
except:
data = None
if data != None:
output_files.append((name, path, data))

results.append(ShellCommandResult(
cmd.commands[i], out, err, res, timeoutHelper.timeoutReached(),
Expand Down

0 comments on commit 434c834

Please sign in to comment.