From 394aca03a2f0dd93389c25a840ba0da3a39c0202 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sun, 3 Nov 2013 12:59:35 +0100 Subject: [PATCH] properly handle unexpected exit while replaying journal --- src/run-tests.pl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/run-tests.pl b/src/run-tests.pl index 4868cd5..ab6cc75 100755 --- a/src/run-tests.pl +++ b/src/run-tests.pl @@ -616,8 +616,18 @@ sub test($$) die "Cannot read journal.\n"; my @nj = ; close FILE; - @ret = runsync("-0 --no-expunge"); + ($xc, @ret) = runsync("-0 --no-expunge"); killcfg(); + if ($xc) { + print "Journal replay failed.\n"; + print "Input == Expected result:\n"; + printchan($$tx[1], $$tx[2], @{ $$tx[3] }); + print "Options:\n"; + print " [ ".join(", ", map('"'.qm($_).'"', @{ $$tx[0] }))." ], [ \"-0\", \"--no-expunge\" ]\n"; + print "Debug output:\n"; + print @ret; + exit 1; + } if (ckstate("slave/.mbsyncstate", @{ $$tx[3] })) { print "Options:\n"; print " [ ".join(", ", map('"'.qm($_).'"', @{ $$tx[0] }))." ]\n";