X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-92-get-set-readonly.c;fp=ccan%2Ftdb2%2Ftest%2Frun-92-get-set-readonly.c;h=c8bbe627d8ff4a971a24c60f897d51203b7c3fc7;hp=31404be20d184d44ff01d3ac8e4d55297cdf2b56;hb=818ed29730b030ce79855fc35c212b51adff3180;hpb=670ba98f74b52df541d153eeab9d3310932e75cd

diff --git a/ccan/tdb2/test/run-92-get-set-readonly.c b/ccan/tdb2/test/run-92-get-set-readonly.c
index 31404be2..c8bbe627 100644
--- a/ccan/tdb2/test/run-92-get-set-readonly.c
+++ b/ccan/tdb2/test/run-92-get-set-readonly.c
@@ -4,12 +4,15 @@
 
 int main(int argc, char *argv[])
 {
-	unsigned int i;
+	unsigned int i, extra_msgs;
 	struct tdb_context *tdb;
 	struct tdb_data key = tdb_mkdata("key", 3);
 	struct tdb_data data = tdb_mkdata("data", 4);
 	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 };
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 48);
 
@@ -20,6 +23,13 @@ int main(int argc, char *argv[])
 		ok1(tdb);
 		ok1(!(tdb_get_flags(tdb) & TDB_RDONLY));
 
+		/* TDB1 complains multiple times. */
+		if (flags[i] & TDB_VERSION1) {
+			extra_msgs = 1;
+		} else {
+			extra_msgs = 0;
+		}
+
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
 
 		tdb_add_flag(tdb, TDB_RDONLY);
@@ -29,14 +39,17 @@ int main(int argc, char *argv[])
 		ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_ERR_RDONLY);
 		ok1(tap_log_messages == 1);
 		ok1(tdb_append(tdb, key, data) == TDB_ERR_RDONLY);
+		tap_log_messages -= extra_msgs;
 		ok1(tap_log_messages == 2);
 		ok1(tdb_delete(tdb, key) == TDB_ERR_RDONLY);
+		tap_log_messages -= extra_msgs;
 		ok1(tap_log_messages == 3);
 
 		/* Can't start a transaction, or any write lock. */
 		ok1(tdb_transaction_start(tdb) == TDB_ERR_RDONLY);
 		ok1(tap_log_messages == 4);
 		ok1(tdb_chainlock(tdb, key) == TDB_ERR_RDONLY);
+		tap_log_messages -= extra_msgs;
 		ok1(tap_log_messages == 5);
 		ok1(tdb_lockall(tdb) == TDB_ERR_RDONLY);
 		ok1(tap_log_messages == 6);
@@ -74,14 +87,17 @@ int main(int argc, char *argv[])
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_ERR_RDONLY);
 		ok1(tap_log_messages == 8);
 		ok1(tdb_append(tdb, key, data) == TDB_ERR_RDONLY);
+		tap_log_messages -= extra_msgs;
 		ok1(tap_log_messages == 9);
 		ok1(tdb_delete(tdb, key) == TDB_ERR_RDONLY);
+		tap_log_messages -= extra_msgs;
 		ok1(tap_log_messages == 10);
 
 		/* Can't start a transaction, or any write lock. */
 		ok1(tdb_transaction_start(tdb) == TDB_ERR_RDONLY);
 		ok1(tap_log_messages == 11);
 		ok1(tdb_chainlock(tdb, key) == TDB_ERR_RDONLY);
+		tap_log_messages -= extra_msgs;
 		ok1(tap_log_messages == 12);
 		ok1(tdb_lockall(tdb) == TDB_ERR_RDONLY);
 		ok1(tap_log_messages == 13);