From 373abcef027321bb59514cc88cb6dfdf325c8ec7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 14 Mar 2017 14:44:59 +0100 Subject: [PATCH] autotest: print consistent information for journal replay failures --- src/run-tests.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/run-tests.pl b/src/run-tests.pl index abb2809..0ef6ef8 100755 --- a/src/run-tests.pl +++ b/src/run-tests.pl @@ -646,10 +646,11 @@ sub test($$$@) ($xc, @ret) = runsync("-0 --no-expunge"); if ($xc) { print "Journal replay failed.\n"; - print "Input == Expected result:\n"; - printchan($tx); print "Options:\n"; print " [ ".join(", ", map('"'.qm($_).'"', @sfx))." ], [ \"-0\", \"--no-expunge\" ]\n"; + print "Old State:\n"; + printstate(@{ $$sx[2] }); + print "Journal:\n".join("", @nj)."\n"; print "Debug output:\n"; print @ret; exit 1; @@ -657,7 +658,7 @@ sub test($$$@) if (ckstate("slave/.mbsyncstate", @{ $$tx[2] })) { print "Journal replay failed.\n"; print "Options:\n"; - print " [ ".join(", ", map('"'.qm($_).'"', @sfx))." ]\n"; + print " [ ".join(", ", map('"'.qm($_).'"', @sfx))." ], [ \"-0\", \"--no-expunge\" ]\n"; print "Old State:\n"; printstate(@{ $$sx[2] }); print "Journal:\n".join("", @nj)."\n";