X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-02-expand.c;h=f3c3d4d4a25a73d6131b15d0c9d6e6a3742c6dfb;hb=a446f1d4d161d66bbb19ba2551cf6429a4865964;hp=7f74cdd5b5c78dbec0465048a540432ce08ad632;hpb=efdf0f2d8f34b4c01c82c558b350ec36c7329b1e;p=ccan

diff --git a/ccan/tdb2/test/run-02-expand.c b/ccan/tdb2/test/run-02-expand.c
index 7f74cdd5..f3c3d4d4 100644
--- a/ccan/tdb2/test/run-02-expand.c
+++ b/ccan/tdb2/test/run-02-expand.c
@@ -1,12 +1,5 @@
 #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"
@@ -45,7 +38,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 +49,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 +63,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);
 	}