X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Frun-die-during-transaction.c;h=aa6b40f6bbad9eb5246d03334ff9b6c0a738cf9f;hp=fb5da455ebf023a2d626acaa41a97b5c7e1986ce;hb=448b9194f76a138eef05047b1aaa5d211f72e97f;hpb=655ef777da34bae1ec992503d754e607d6cebf8c diff --git a/ccan/tdb/test/run-die-during-transaction.c b/ccan/tdb/test/run-die-during-transaction.c index fb5da455..aa6b40f6 100644 --- a/ccan/tdb/test/run-die-during-transaction.c +++ b/ccan/tdb/test/run-die-during-transaction.c @@ -20,6 +20,7 @@ static int ftruncate_check(int fd, off_t length); #include #include #include +#include #include #include #include @@ -97,6 +98,10 @@ static bool test_death(enum operation op, struct agent *agent) current = target = 0; reset: + unlink(TEST_DBNAME); + tdb = tdb_open_ex(TEST_DBNAME, 1024, TDB_NOMMAP, + O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL); + if (setjmp(jmpbuf) != 0) { /* We're partway through. Simulate our death. */ close(tdb->fd); @@ -152,10 +157,6 @@ reset: goto reset; } - unlink(TEST_DBNAME); - tdb = tdb_open_ex(TEST_DBNAME, 1024, TDB_NOMMAP, - O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL); - /* Put key for agent to fetch. */ key.dsize = strlen(KEY_STRING); key.dptr = (void *)KEY_STRING;