Commit 6077c3d7 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Pavel Emelyanov

zdtm.py: print full pie errors in `grep Error` omitting line breaks

Before:
=[log]=> dump/zdtm/transition/shmem/142/1/dump.log
------------------------ grep Error ------------------------
pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
------------------------ ERROR OVER ------------------------

After:
=[log]=> dump/zdtm/transition/shmem/62/1/dump.log
------------------------ grep Error ------------------------
pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 1: e/asm/parasite.h:45): Failed to dump TLS descriptor #13: -4
pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 1: e/asm/parasite.h:45): Failed to dump TLS descriptor #14: -4
pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 5: e/asm/parasite.h:45): Failed to dump TLS descriptor #13: -4
pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 5: e/asm/parasite.h:45): Failed to dump TLS descriptor #14: -4
pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 6: e/asm/parasite.h:45): Failed to dump TLS descriptor #13: -4
pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ>
pie: 6: e/asm/parasite.h:45): Failed to dump TLS descriptor #14: -4
------------------------ ERROR OVER ------------------------
Signed-off-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 890457ef
...@@ -1482,15 +1482,27 @@ def print_sep(title, sep = "=", width = 80): ...@@ -1482,15 +1482,27 @@ def print_sep(title, sep = "=", width = 80):
print (" " + title + " ").center(width, sep) print (" " + title + " ").center(width, sep)
def print_error(line):
line = line.rstrip()
print line
if line.endswith('>'): # combine pie output
return True
return False
def grep_errors(fname): def grep_errors(fname):
first = True first = True
print_next = False
for l in open(fname): for l in open(fname):
if "Error" in l: if "Error" in l:
if first: if first:
print_fname(fname, 'log') print_fname(fname, 'log')
print_sep("grep Error", "-", 60) print_sep("grep Error", "-", 60)
first = False first = False
print l, print_next = print_error(l)
else:
if print_next:
print_next = print_error(l)
if not first: if not first:
print_sep("ERROR OVER", "-", 60) print_sep("ERROR OVER", "-", 60)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment