X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-05-readonly-open.c;h=80eb56759b703b95b866424b43e3c69b830af97c;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=0f1a4343d82f7fc3e28f7b6243450e3dfa2898f4;hpb=de868b8eee34e39b4465dd9def9141b97926e847;p=ccan

diff --git a/ccan/tdb2/test/run-05-readonly-open.c b/ccan/tdb2/test/run-05-readonly-open.c
index 0f1a4343..80eb5675 100644
--- a/ccan/tdb2/test/run-05-readonly-open.c
+++ b/ccan/tdb2/test/run-05-readonly-open.c
@@ -1,41 +1,26 @@
 #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 expand 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_DEFAULT, TDB_NOMMAP,
-			TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT };
+			TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT,
+			TDB_VERSION1, TDB_NOMMAP|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), d;
 	union tdb_attribute seed_attr;
 	unsigned int msgs = 0;
 
 	failtest_init(argc, argv);
-	failtest_hook = suppress_failure;
+	failtest_hook = block_repeat_failures;
 	failtest_exit_check = exit_check_log;
 
 	seed_attr.base.attr = TDB_ATTRIBUTE_SEED;
@@ -46,7 +31,9 @@ int main(int argc, char *argv[])
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 11);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-05-readonly-open.tdb", flags[i],
-			       O_RDWR|O_CREAT|O_TRUNC, 0600, &seed_attr);
+			       O_RDWR|O_CREAT|O_TRUNC, 0600,
+			       flags[i] & TDB_VERSION1
+			       ? &tap_log_attr : &seed_attr);
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 		tdb_close(tdb);