From 6077c3d7f0c74eb534c93496d8fbdd36aea41c4d Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Wed, 7 Dec 2016 18:28:00 +0300 Subject: [PATCH] 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: Dmitry Safonov Signed-off-by: Pavel Emelyanov --- test/zdtm.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/zdtm.py b/test/zdtm.py index 36387ebb9..9de6b8fc4 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -1482,15 +1482,27 @@ def print_sep(title, sep = "=", width = 80): 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): first = True + print_next = False for l in open(fname): if "Error" in l: if first: print_fname(fname, 'log') print_sep("grep Error", "-", 60) first = False - print l, + print_next = print_error(l) + else: + if print_next: + print_next = print_error(l) if not first: print_sep("ERROR OVER", "-", 60)