X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-50-multiple-freelists.c;h=0618a88dbe1321b237c0100de847c90da7253594;hp=1e33eb1b0161e9e917768bff19bbb9862d6a708a;hb=476567430be6962625bf399192e20938985232c7;hpb=2491b65a6d10cd6ca1a3e05bf535eb0180047922

diff --git a/ccan/tdb2/test/run-50-multiple-freelists.c b/ccan/tdb2/test/run-50-multiple-freelists.c
index 1e33eb1b..0618a88d 100644
--- a/ccan/tdb2/test/run-50-multiple-freelists.c
+++ b/ccan/tdb2/test/run-50-multiple-freelists.c
@@ -1,11 +1,5 @@
-#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 "tdb2-source.h"
 #include <ccan/tap/tap.h>
-#include <ccan/tdb2/transaction.c>
 #include "logging.h"
 #include "layout.h"
 
@@ -15,12 +9,16 @@ int main(int argc, char *argv[])
 	struct tdb_context *tdb;
 	struct tdb_layout *layout;
 	TDB_DATA key, data;
+	union tdb_attribute seed;
+
+	/* This seed value previously tickled a layout.c bug. */
+	seed.base.attr = TDB_ATTRIBUTE_SEED;
+	seed.seed.seed = 0xb1142bc054d035b4ULL;
+	seed.base.next = &tap_log_attr;
 
 	plan_tests(11);
-	key.dptr = (unsigned char *)"Hello";
-	data.dptr = (unsigned char *)"world";
-	data.dsize = 5;
-	key.dsize = 5;
+	key = tdb_mkdata("Hello", 5);
+	data = tdb_mkdata("world", 5);
 
 	/* Create a TDB with three free tables. */
 	layout = new_tdb_layout(NULL);
@@ -37,7 +35,7 @@ int main(int argc, char *argv[])
 	key.dsize--;
 	tdb_layout_add_used(layout, key, data, 8);
 	tdb_layout_add_free(layout, 40, 0);
-	tdb = tdb_layout_get(layout);
+	tdb = tdb_layout_get(layout, &seed);
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 	off = get_free(tdb, 0, 80 - sizeof(struct tdb_used_record), 0,
@@ -65,6 +63,7 @@ int main(int argc, char *argv[])
 	ok1(off == 0);
 
 	tdb_close(tdb);
+	tdb_layout_free(layout);
 
 	ok1(tap_log_messages == 0);
 	return exit_status();