X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-fork-test.c;h=7ff71366cf6a39d1d34da26cbcacf3bf53c0c902;hb=818ed29730b030ce79855fc35c212b51adff3180;hp=ff1caa06e0f081f50e7f669feee24f23ea00a2d8;hpb=e6862ec8ae269217f3596f5af84747868b983afb;p=ccan

diff --git a/ccan/tdb2/test/run-fork-test.c b/ccan/tdb2/test/run-fork-test.c
index ff1caa06..7ff71366 100644
--- a/ccan/tdb2/test/run-fork-test.c
+++ b/ccan/tdb2/test/run-fork-test.c
@@ -10,14 +10,7 @@
  * Note that we don't hold a lock across tdb_traverse callbacks, so
  * that doesn't matter.
  */
-#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/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -26,16 +19,24 @@
 static enum TDB_ERROR fork_in_parse(TDB_DATA key, TDB_DATA data,
 				    struct tdb_context *tdb)
 {
-	int status;
+	int status, extra_messages;
+
+	if (tdb_get_flags(tdb) & TDB_VERSION1) {
+		extra_messages = 1;
+	} else {
+		extra_messages = 0;
+	}
 
 	if (fork() == 0) {
 		/* We expect this to fail. */
 		if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
 			exit(1);
+		tap_log_messages -= extra_messages;
 
 		if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
 			exit(1);
 
+		tap_log_messages -= extra_messages;
 		if (tap_log_messages != 2)
 			exit(2);
 
@@ -54,13 +55,22 @@ 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);
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 14);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		int status;
+		int status, extra_messages;
+
+		if (flags[i] & TDB_VERSION1) {
+			extra_messages = 1;
+		} else {
+			extra_messages = 0;
+		}
 
 		tap_log_messages = 0;
 
@@ -77,18 +87,20 @@ int main(int argc, char *argv[])
 			/* We expect this to fail. */
 			if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tap_log_messages != 2)
 				return 2;
 
 			tdb_chainunlock(tdb, key);
-			if (tap_log_messages != 2)
+			if (tap_log_messages != 3)
 				return 3;
 			tdb_close(tdb);
-			if (tap_log_messages != 2)
+			if (tap_log_messages != 3)
 				return 4;
 			return 0;
 		}
@@ -101,9 +113,11 @@ int main(int argc, char *argv[])
 			/* We expect this to fail. */
 			if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tap_log_messages != 2)
 				return 2;
@@ -126,9 +140,11 @@ int main(int argc, char *argv[])
 			/* This would always fail anyway... */
 			if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tap_log_messages != 2)
 				return 2;
@@ -152,15 +168,18 @@ int main(int argc, char *argv[])
 			/* We expect this to fail. */
 			if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
 				return 1;
+			tap_log_messages -= extra_messages;
 
 			if (tap_log_messages != 2)
 				return 2;
 
 			if (tdb_transaction_commit(tdb) != TDB_ERR_LOCK)
 				return 3;
+			tap_log_messages -= extra_messages;
 
 			tdb_close(tdb);
 			if (tap_log_messages < 3)