From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sun, 24 Oct 2010 22:51:51 +0000 (+1030)
Subject: tdb2: fix intermittent test fail.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=d71f8b0bc81f564b57a062561dd136c6467f57e5

tdb2: fix intermittent test fail.

With correct seed, we could expand hash and break test.
---

diff --git a/ccan/tdb2/test/run-30-exhaust-before-expand.c b/ccan/tdb2/test/run-30-exhaust-before-expand.c
index 5338d564..8be5a5ed 100644
--- a/ccan/tdb2/test/run-30-exhaust-before-expand.c
+++ b/ccan/tdb2/test/run-30-exhaust-before-expand.c
@@ -8,12 +8,6 @@
 #include <err.h>
 #include "logging.h"
 
-static uint64_t fixedhash(const void *key, size_t len, uint64_t seed, void *p)
-{
-	return hash64_stable((const unsigned char *)key, len,
-			     *(uint64_t *)p);
-}
-
 int main(int argc, char *argv[])
 {
 	unsigned int i, j;
@@ -21,13 +15,7 @@ int main(int argc, char *argv[])
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
 			TDB_NOMMAP|TDB_CONVERT };
-	uint64_t seed = 0;
-	union tdb_attribute fixed_hattr
-		= { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-			      .hash_fn = fixedhash,
-			      .hash_private = &seed } };
 
-	fixed_hattr.base.next = &tap_log_attr;
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 5 + 1);
 
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
@@ -45,9 +33,9 @@ int main(int argc, char *argv[])
 			continue;
 
 		/* We don't want the hash to expand, so we use one alloc to
-		 * chew up over 90% of the space first. */
+		 * chew up over most of the space first. */
 		j = -1;
-		d.dsize = (1 << INITIAL_ZONE_BITS) * 9 / 10;
+		d.dsize = (1 << INITIAL_ZONE_BITS) - 500;
 		d.dptr = malloc(d.dsize);
 		ok1(tdb_store(tdb, k, d, TDB_INSERT) == 0);
 		ok1(tdb->map_size == sizeof(struct tdb_header)