tdb2: test: Speed up run-01-new_database.

[ccan] / ccan / tdb2 / test / run-01-new_database.c

diff --git a/ccan/tdb2/test/run-01-new_database.c b/ccan/tdb2/test/run-01-new_database.c
index 75f2da13e1b808026117cf8da99cae45bfcb6569..7b5a57df529ee61ba7f09942ff3effbb62c3491b 100644 (file)
--- a/ccan/tdb2/test/run-01-new_database.c
+++ b/ccan/tdb2/test/run-01-new_database.c
@@ -1,10 +1,20 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/check.c>
+#include <ccan/failtest/failtest_override.h>
+#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[])
 {
@@ -12,18 +22,29 @@ int main(int argc, char *argv[])
        struct tdb_context *tdb;
        int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
-                       TDB_NOMMAP|TDB_CONVERT };
+                       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 };
 
-       plan_tests(sizeof(flags) / sizeof(flags[0]) * 2 + 1);
+       failtest_init(argc, argv);
+       failtest_hook = suppress_failure;
+       failtest_exit_check = exit_check_log;
+       plan_tests(sizeof(flags) / sizeof(flags[0]) * 3);
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
                tdb = tdb_open("run-new_database.tdb", flags[i],
                               O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
-               ok1(tdb);
-               if (tdb) {
-                       ok1(tdb_check(tdb, NULL, NULL) == 0);
-                       tdb_close(tdb);
-               }
+               if (!ok1(tdb))
+                       failtest_exit(exit_status());
+
+               failtest_suppress = true;
+               ok1(tdb_check(tdb, NULL, NULL) == 0);
+               failtest_suppress = false;
+               tdb_close(tdb);
+               if (!ok1(tap_log_messages == 0))
+                       break;
        }
-       ok1(tap_log_messages == 0);
-       return exit_status();
+       failtest_exit(exit_status());
 }