failtest: add --trace to replace --tracepath

[ccan] / ccan / tdb2 / test / run-02-expand.c

diff --git a/ccan/tdb2/test/run-02-expand.c b/ccan/tdb2/test/run-02-expand.c
index 7f74cdd5b5c78dbec0465048a540432ce08ad632..e3f5905aec6977a524746639774654939de2b485 100644 (file)
--- a/ccan/tdb2/test/run-02-expand.c
+++ b/ccan/tdb2/test/run-02-expand.c
@@ -1,28 +1,10 @@
 #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/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/hash.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;
@@ -35,7 +17,7 @@ int main(int argc, char *argv[])
        plan_tests(sizeof(flags) / sizeof(flags[0]) * 11 + 1);
 
        failtest_init(argc, argv);
-       failtest_hook = suppress_failure;
+       failtest_hook = block_repeat_failures;
        failtest_exit_check = exit_check_log;
 
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
@@ -45,7 +27,7 @@ int main(int argc, char *argv[])
                if (!ok1(tdb))
                        break;
 
-               val = tdb->map_size;
+               val = tdb->file->map_size;
                /* Need some hash lock for expand. */
                ok1(tdb_lock_hashes(tdb, 0, 1, F_WRLCK, TDB_LOCK_WAIT) == 0);
                failtest_suppress = false;
@@ -56,11 +38,11 @@ int main(int argc, char *argv[])
                }
                failtest_suppress = true;
                        
-               ok1(tdb->map_size >= val + 1 * TDB_EXTENSION_FACTOR);
+               ok1(tdb->file->map_size >= val + 1 * TDB_EXTENSION_FACTOR);
                ok1(tdb_unlock_hashes(tdb, 0, 1, F_WRLCK) == 0);
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
-               val = tdb->map_size;
+               val = tdb->file->map_size;
                ok1(tdb_lock_hashes(tdb, 0, 1, F_WRLCK, TDB_LOCK_WAIT) == 0);
                failtest_suppress = false;
                if (!ok1(tdb_expand(tdb, 1024) == 0)) {
@@ -70,7 +52,7 @@ int main(int argc, char *argv[])
                }
                failtest_suppress = true;
                ok1(tdb_unlock_hashes(tdb, 0, 1, F_WRLCK) == 0);
-               ok1(tdb->map_size >= val + 1024 * TDB_EXTENSION_FACTOR);
+               ok1(tdb->file->map_size >= val + 1024 * TDB_EXTENSION_FACTOR);
                ok1(tdb_check(tdb, NULL, NULL) == 0);
                tdb_close(tdb);
        }