X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-11-simple-fetch.c;h=ad97be30940aabb26306cc8dcd27693ee6611bd5;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=c16c28f8ea8c1def7ad0a75394fc264c99055d20;hpb=efdf0f2d8f34b4c01c82c558b350ec36c7329b1e;p=ccan

diff --git a/ccan/tdb2/test/run-11-simple-fetch.c b/ccan/tdb2/test/run-11-simple-fetch.c
index c16c28f8..ad97be30 100644
--- a/ccan/tdb2/test/run-11-simple-fetch.c
+++ b/ccan/tdb2/test/run-11-simple-fetch.c
@@ -1,40 +1,27 @@
 #include <ccan/failtest/failtest_override.h>
-#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/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"
 #include "failtest_helper.h"
 
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want fetch testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
-	if (failtest_suppress)
-		return FAIL_DONT_FAIL;
-	return block_repeat_failures(history, num);
-}
-
 int main(int argc, char *argv[])
 {
 	unsigned int i;
 	struct tdb_context *tdb;
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
-			TDB_NOMMAP|TDB_CONVERT };
-	struct tdb_data key = { (unsigned char *)"key", 3 };
-	struct tdb_data data = { (unsigned char *)"data", 4 };
+			TDB_NOMMAP|TDB_CONVERT,
+			TDB_INTERNAL|TDB_VERSION1, TDB_VERSION1,
+			TDB_NOMMAP|TDB_VERSION1,
+			TDB_INTERNAL|TDB_CONVERT|TDB_VERSION1,
+			TDB_CONVERT|TDB_VERSION1,
+			TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
+	struct tdb_data key = tdb_mkdata("key", 3);
+	struct tdb_data data = tdb_mkdata("data", 4);
 
 	failtest_init(argc, argv);
-	failtest_hook = suppress_failure;
+	failtest_hook = block_repeat_failures;
 	failtest_exit_check = exit_check_log;
 
 	failtest_suppress = true;
@@ -60,14 +47,14 @@ int main(int argc, char *argv[])
 			if (!ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS))
 				goto fail;
 			failtest_suppress = true;
-			ok1(data_equal(d, data));
+			ok1(tdb_deq(d, data));
 			free(d.dptr);
 			ok1(tdb_check(tdb, NULL, NULL) == 0);
 			tdb_close(tdb);
 		}
 	}
 	ok1(tap_log_messages == 0);
-	return exit_status();
+	failtest_exit(exit_status());
 
 fail:
 	failtest_suppress = true;