tdb2: allow multiple chain locks.

[ccan] / ccan / tdb2 / test / run-remap-in-read_traverse.c

diff --git a/ccan/tdb2/test/run-remap-in-read_traverse.c b/ccan/tdb2/test/run-remap-in-read_traverse.c
index 8dd1bf8330449dc20bc8d12f32c8cf282be6bc15..d784ca34074ec7f8b8fe0cee6c957e60f42d578b 100644 (file)
--- a/ccan/tdb2/test/run-remap-in-read_traverse.c
+++ b/ccan/tdb2/test/run-remap-in-read_traverse.c
@@ -1,6 +1,7 @@
 /* We had a bug where we marked the tdb read-only for a tdb_traverse_read.
  * If we then expanded the tdb, we would remap read-only, and later SEGV. */
 #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>
@@ -39,7 +40,7 @@ int main(int argc, char *argv[])
        unsigned int i;
        struct agent *agent;
        struct tdb_context *tdb;
-       struct tdb_data d = { (unsigned char *)"hello", 5 };
+       struct tdb_data d = tdb_mkdata("hello", 5);
        const char filename[] = "run-remap-in-read_traverse.tdb";
 
        plan_tests(4);
@@ -50,13 +51,15 @@ int main(int argc, char *argv[])
                       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 
        ok1(external_agent_operation(agent, OPEN, filename) == SUCCESS);
-       i = add_records_to_grow(agent, tdb->fd, tdb->map_size);
+       i = add_records_to_grow(agent, tdb->file->fd, tdb->file->map_size);
 
-       /* Do a read traverse. */
-       ok1(tdb_traverse_read(tdb, NULL, NULL) == i);
+       /* Do a traverse. */
+       ok1(tdb_traverse(tdb, NULL, NULL) == i);
 
        /* Now store something! */
        ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
        ok1(tap_log_messages == 0);
+       tdb_close(tdb);
+       free_external_agent(agent);
        return exit_status();
 }