From 01b2214a1893db5071addf1fdf17e9ac06ed63a0 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 08:13:26 +0930 Subject: tdb2: test: try (almost) all tests with TDB_VERSION1 flag. There are some minor changes required, in particular: 1) Make sure lockcheck understands tdb1 allrecord lock upgrades. 2) Handle tdb1 sequence number jumps: various operations increment the sequence number twice, especually tdb_append. 3) Don't test fail on unlock, since it gets triggered with traversal on the tdb1 backend (we didn't actually ever test this case for tdb2). 4) Move clear_if_first to offset 4, to match tdb1. Signed-off-by: Rusty Russell (Imported from CCAN commit 818ed29730b030ce79855fc35c212b51adff3180) --- lib/tdb2/test/run-summary.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'lib/tdb2/test/run-summary.c') diff --git a/lib/tdb2/test/run-summary.c b/lib/tdb2/test/run-summary.c index ef29be2440..33012bae1e 100644 --- a/lib/tdb2/test/run-summary.c +++ b/lib/tdb2/test/run-summary.c @@ -8,7 +8,12 @@ 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 }; struct tdb_data key = { (unsigned char *)&j, sizeof(j) }; struct tdb_data data = { (unsigned char *)&j, sizeof(j) }; char *summary; @@ -36,12 +41,14 @@ int main(int argc, char *argv[]) ok1(strstr(summary, "Number of records: 500\n")); ok1(strstr(summary, "Smallest/average/largest keys: 4/4/4\n")); ok1(strstr(summary, "Smallest/average/largest data: 0/2/4\n")); - if (j == TDB_SUMMARY_HISTOGRAMS) + if (!(flags[i] & TDB_VERSION1) + && j == TDB_SUMMARY_HISTOGRAMS) { ok1(strstr(summary, "|") && strstr(summary, "*")); - else + } else { ok1(!strstr(summary, "|") && !strstr(summary, "*")); + } free(summary); } tdb_close(tdb); -- cgit