X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-summary.c;h=73e180df5117b470e84047ba859cede095fce8f9;hp=006b87b660e4ab69a1c0f116328d158812e0c17b;hb=818ed29730b030ce79855fc35c212b51adff3180;hpb=a2d8a4bf0c36bf312b30fdce3ae89d5f3ae21186

diff --git a/ccan/tdb2/test/run-summary.c b/ccan/tdb2/test/run-summary.c
index 006b87b6..73e180df 100644
--- a/ccan/tdb2/test/run-summary.c
+++ b/ccan/tdb2/test/run-summary.c
@@ -1,10 +1,4 @@
-#include <ccan/tdb2/tdb.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/summary.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
@@ -14,12 +8,17 @@ 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;
 
-	plan_tests(sizeof(flags) / sizeof(flags[0]) * (1 + 2 * 17) + 1);
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * (1 + 2 * 5) + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-summary.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
@@ -38,29 +37,18 @@ int main(int argc, char *argv[])
 		for (j = 0;
 		     j <= TDB_SUMMARY_HISTOGRAMS;
 		     j += TDB_SUMMARY_HISTOGRAMS) {
-			summary = tdb_summary(tdb, j);
+			ok1(tdb_summary(tdb, j, &summary) == TDB_SUCCESS);
 			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"));
-			ok1(strstr(summary, "Free bucket 16:"));
-			ok1(strstr(summary, "Free bucket 24:"));
-			ok1(strstr(summary, "Free bucket 32:"));
-			ok1(strstr(summary, "Free bucket 40:"));
-			ok1(strstr(summary, "Free bucket 48:"));
-			ok1(strstr(summary, "Free bucket 56:"));
-			ok1(strstr(summary, "Free bucket 64:"));
-			ok1(strstr(summary, "Free bucket 72:"));
-			ok1(strstr(summary, "Free bucket 80:"));
-			ok1(strstr(summary, "Free bucket 88-136:"));
-			ok1(strstr(summary, "Free bucket 144-264:"));
-			ok1(strstr(summary, "Free bucket 272-520:"));
-			ok1(strstr(summary, "Free bucket 528-1032:"));
-			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);