X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-56-open-during-transaction.c;h=9262c0528eb8a2f4bcf3b6691b30854751d7e4b0;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=80a0b43c6c1c34d451bf6810b6386f3255313e77;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782;p=ccan

diff --git a/ccan/tdb2/test/run-56-open-during-transaction.c b/ccan/tdb2/test/run-56-open-during-transaction.c
index 80a0b43c..9262c052 100644
--- a/ccan/tdb2/test/run-56-open-during-transaction.c
+++ b/ccan/tdb2/test/run-56-open-during-transaction.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#include <ccan/tdb2/private.h>
 #include <unistd.h>
 #include "lock-tracking.h"
 
@@ -11,13 +11,7 @@ static int ftruncate_check(int fd, off_t length);
 #define fcntl fcntl_with_lockcheck
 #define ftruncate ftruncate_check
 
-#include <ccan/tdb2/tdb.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 <stdlib.h>
 #include <stdbool.h>
@@ -134,15 +128,16 @@ static int ftruncate_check(int fd, off_t length)
 
 int main(int argc, char *argv[])
 {
-	const int flags[] = { TDB_DEFAULT,
-			      TDB_NOMMAP,
-			      TDB_CONVERT,
-			      TDB_CONVERT | TDB_NOMMAP };
+	const int flags[] = { TDB_DEFAULT, TDB_NOMMAP,
+			TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT,
+			TDB_VERSION1, TDB_NOMMAP|TDB_VERSION1,
+			TDB_CONVERT|TDB_VERSION1,
+			TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
 	int i;
 	struct tdb_context *tdb;
 	TDB_DATA key, data;
 
-	plan_tests(20);
+	plan_tests(sizeof(flags)/sizeof(flags[0]) * 5);
 	agent = prepare_external_agent();
 	if (!agent)
 		err(1, "preparing agent");
@@ -159,10 +154,8 @@ int main(int argc, char *argv[])
 
 		opened = true;
 		ok1(tdb_transaction_start(tdb) == 0);
-		key.dsize = strlen("hi");
-		key.dptr = (void *)"hi";
-		data.dptr = (void *)"world";
-		data.dsize = strlen("world");
+		key = tdb_mkdata("hi", strlen("hi"));
+		data = tdb_mkdata("world", strlen("world"));
 
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 		ok1(tdb_transaction_commit(tdb) == 0);