X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Frun-3G-file.c;h=d56aed57bd42a4fd3871c21b791b1f7e3e8ad701;hp=8b75f2b8eb632e5c82f716dfeea783c5f9b68cd5;hb=d117f992bde6b7157a8eecbce8a026f2aa7ab4ae;hpb=b2c0ebc6f53b05b222937991f100f8a89701f9b1

diff --git a/ccan/tdb/test/run-3G-file.c b/ccan/tdb/test/run-3G-file.c
index 8b75f2b8..d56aed57 100644
--- a/ccan/tdb/test/run-3G-file.c
+++ b/ccan/tdb/test/run-3G-file.c
@@ -1,18 +1,21 @@
 /* We need this otherwise fcntl locking fails. */
 #define _FILE_OFFSET_BITS 64
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tdb/check.c>
+#include <ccan/tdb/hash.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
+#include "logging.h"
 
 static int tdb_expand_file_sparse(struct tdb_context *tdb,
 				  tdb_off_t size,
@@ -49,9 +52,7 @@ static const struct tdb_methods large_io_methods = {
 	tdb_write,
 	tdb_next_hash_chain,
 	tdb_oob,
-	tdb_expand_file_sparse,
-	tdb_brlock,
-	tdb_brunlock
+	tdb_expand_file_sparse
 };
 
 static int test_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
@@ -71,11 +72,11 @@ int main(int argc, char *argv[])
 	TDB_DATA key, orig_data, data;
 	uint32_t hash;
 	tdb_off_t rec_ptr;
-	struct list_struct rec;
+	struct tdb_record rec;
 
 	plan_tests(24);
-	tdb = tdb_open("/tmp/test.tdb", 1024, TDB_CLEAR_IF_FIRST,
-		       O_CREAT|O_TRUNC|O_RDWR, 0600);
+	tdb = tdb_open_ex("run-36-file.tdb", 1024, TDB_CLEAR_IF_FIRST,
+			  O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
 
 	ok1(tdb);
 	tdb->methods = &large_io_methods;