lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle abnormal program exit during regtest

Browse Source
This commit is contained in:
Oswald Buddenhagen 2006-12-09 10:38:11 +00:00
parent 6800f1636e
commit 9056504483
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/run-tests.pl
View File

@ -281,10 +281,11 @@ sub killcfg()
# $options # $options
sub runsync($) sub runsync($)
{ {
# open FILE, "valgrind -q --log-fd=3 ../mbsync ".shift()." -c .mbsyncrc test 3>&2 2>&1 |";
open FILE, "../mbsync -D ".shift()." -c .mbsyncrc test 2>&1 |"; open FILE, "../mbsync -D ".shift()." -c .mbsyncrc test 2>&1 |";
my @out = <FILE>; my @out = <FILE>;
close FILE or push(@out, $! ? "*** error closing mbsync: $!\n" : "*** mbsync exited with signal ".($?&127).", code ".($?>>8)."\n"); close FILE or push(@out, $! ? "*** error closing mbsync: $!\n" : "*** mbsync exited with signal ".($?&127).", code ".($?>>8)."\n");
return @out; return $?, @out;
} }
@ -584,7 +585,18 @@ sub test($$)
mkchan($$sx[0], $$sx[1], @{ $$sx[2] }); mkchan($$sx[0], $$sx[1], @{ $$sx[2] });
&writecfg(@{ $$tx[0] }); &writecfg(@{ $$tx[0] });
my @ret = runsync("-J"); my ($xc, @ret) = runsync("-J");
if ($xc) {
print "Input:\n";
printchan($$sx[0], $$sx[1], @{ $$sx[2] });
print "Options:\n";
print " [ ".join(", ", map('"'.qm($_).'"', @{ $$tx[0] }))." ]\n";
print "Expected result:\n";
printchan($$tx[1], $$tx[2], @{ $$tx[3] });
print "Debug output:\n";
print @ret;
exit 1;
}
if (ckchan($$tx[1], $$tx[2], @{ $$tx[3] })) { if (ckchan($$tx[1], $$tx[2], @{ $$tx[3] })) {
print "Input:\n"; print "Input:\n";
printchan($$sx[0], $$sx[1], @{ $$sx[2] }); printchan($$sx[0], $$sx[1], @{ $$sx[2] });