tdb2: test: fix run-57-die-during-transaction.c to be more efficient.

[ccan] / ccan / tdb2 / test / run-open-multiple-times.c

diff --git a/ccan/tdb2/test/run-open-multiple-times.c b/ccan/tdb2/test/run-open-multiple-times.c
index 1f35648bb192c445da0fe49a455d95ea544991c1..4d60b2027993883dddbfa92aba8c2287196d8962 100644 (file)
--- a/ccan/tdb2/test/run-open-multiple-times.c
+++ b/ccan/tdb2/test/run-open-multiple-times.c
@@ -1,23 +1,19 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
 {
-       unsigned int i;
+       unsigned int i, extra_messages;
        struct tdb_context *tdb, *tdb2;
        struct tdb_data key = { (unsigned char *)&i, sizeof(i) };
        struct tdb_data data = { (unsigned char *)&i, sizeof(i) };
        struct tdb_data d = { NULL, 0 }; /* Bogus GCC warning */
        int flags[] = { TDB_DEFAULT, TDB_NOMMAP,
-                       TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT };
+                       TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT,
+                       TDB_VERSION1, TDB_NOMMAP|TDB_VERSION1,
+                       TDB_CONVERT|TDB_VERSION1,
+                       TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
 
        plan_tests(sizeof(flags) / sizeof(flags[0]) * 28);
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
@@ -26,6 +22,12 @@ int main(int argc, char *argv[])
                ok1(tdb);
                if (!tdb)
                        continue;
+
+               if (flags[i] & TDB_VERSION1) {
+                       extra_messages = 1;
+               } else {
+                       extra_messages = 0;
+               }
                tdb2 = tdb_open("run-open-multiple-times.tdb", flags[i],
                                O_RDWR|O_CREAT, 0600, &tap_log_attr);
                ok1(tdb_check(tdb, NULL, NULL) == 0);
@@ -34,8 +36,7 @@ int main(int argc, char *argv[])
                /* Store in one, fetch in the other. */
                ok1(tdb_store(tdb, key, data, TDB_REPLACE) == 0);
                ok1(tdb_fetch(tdb2, key, &d) == TDB_SUCCESS);
-               ok1(d.dptr && d.dsize == data.dsize
-                   && memcmp(d.dptr, data.dptr, d.dsize) == 0);
+               ok1(tdb_deq(d, data));
                free(d.dptr);
 
                /* Vice versa, with delete. */
@@ -47,8 +48,7 @@ int main(int argc, char *argv[])
 
                ok1(tdb_store(tdb2, key, data, TDB_REPLACE) == 0);
                ok1(tdb_fetch(tdb2, key, &d) == TDB_SUCCESS);
-               ok1(d.dptr && d.dsize == data.dsize
-                   && memcmp(d.dptr, data.dptr, d.dsize) == 0);
+               ok1(tdb_deq(d, data));
                free(d.dptr);
 
                /* Reopen */
@@ -60,12 +60,15 @@ int main(int argc, char *argv[])
 
                /* Anything in the other one should fail. */
                ok1(tdb_fetch(tdb, key, &d) == TDB_ERR_LOCK);
+               tap_log_messages -= extra_messages;
                ok1(tap_log_messages == 1);
                ok1(tdb_store(tdb, key, data, TDB_REPLACE) == TDB_ERR_LOCK);
+               tap_log_messages -= extra_messages;
                ok1(tap_log_messages == 2);
                ok1(tdb_transaction_start(tdb) == TDB_ERR_LOCK);
                ok1(tap_log_messages == 3);
                ok1(tdb_chainlock(tdb, key) == TDB_ERR_LOCK);
+               tap_log_messages -= extra_messages;
                ok1(tap_log_messages == 4);
 
                /* Transaciton should work as normal. */
@@ -75,8 +78,7 @@ int main(int argc, char *argv[])
                ok1(tdb_close(tdb2) == 0);
 
                ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
-               ok1(d.dptr && d.dsize == data.dsize
-                   && memcmp(d.dptr, data.dptr, d.dsize) == 0);
+               ok1(tdb_deq(d, data));
                free(d.dptr);
                ok1(tdb_close(tdb) == 0);
                ok1(tap_log_messages == 4);