From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 31 Aug 2011 06:09:17 +0000 (+0930)
Subject: tdb2: speed up testing.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=a99c2ccf97465d47c3277d997ea93f20ff97ad4d

tdb2: speed up testing.

The time to run tests under valgrind has become excessive; particularly
the failure tests which fork().   Thus we cut down testing:

1) api-94-repack: reduce from 234 seconds to 2 seconds by cutting
   iterations, despite adding TDB_VERSION1 tests.

2) api-missing-entries: reduce from 17 seconds to under 1 second by
   not checking db inside loop, but at end.

This reduces the total ccanlint time from 729 to 489 seconds.
---

diff --git a/ccan/tdb2/test/api-93-repack.c b/ccan/tdb2/test/api-93-repack.c
index 0a2e6d5b..74a8b5ed 100644
--- a/ccan/tdb2/test/api-93-repack.c
+++ b/ccan/tdb2/test/api-93-repack.c
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include "logging.h"
 
-#define NUM_TESTS 50000
+#define NUM_TESTS 1000
 
 static bool store_all(struct tdb_context *tdb)
 {
@@ -53,6 +53,9 @@ int main(int argc, char *argv[])
 	struct tdb_context *tdb;
 	int flags[] = { TDB_DEFAULT, TDB_NOMMAP,
 			TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT,
+			TDB_VERSION1, TDB_VERSION1|TDB_NOMMAP,
+			TDB_VERSION1|TDB_CONVERT,
+			TDB_VERSION1|TDB_NOMMAP|TDB_CONVERT
 	};
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 6 + 1);
diff --git a/ccan/tdb2/test/api-missing-entries.c b/ccan/tdb2/test/api-missing-entries.c
index 1932947a..0b21e1ee 100644
--- a/ccan/tdb2/test/api-missing-entries.c
+++ b/ccan/tdb2/test/api-missing-entries.c
@@ -26,16 +26,15 @@ int main(int argc, char *argv[])
 						.fn = failhash } };
 
 	hattr.base.next = &tap_log_attr;
-	plan_tests(1 + 2 * NUM_RECORDS + 1);
+	plan_tests(1 + NUM_RECORDS + 2);
 
 	tdb = tdb_open("run-missing-entries.tdb", TDB_INTERNAL,
 		       O_RDWR|O_CREAT|O_TRUNC, 0600, &hattr);
-	ok1(tdb);
-	if (tdb) {
+	if (ok1(tdb)) {
 		for (i = 0; i < NUM_RECORDS; i++) {
 			ok1(tdb_store(tdb, key, data, TDB_REPLACE) == 0);
-			ok1(tdb_check(tdb, NULL, NULL) == 0);
 		}
+		ok1(tdb_check(tdb, NULL, NULL) == 0);
 		tdb_close(tdb);
 	}