From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 23 Mar 2012 00:13:48 +0000 (+1030)
Subject: lib/tdb: fix test/run-die-during-transaction when HAVE_INCOHERENT_MMAP.
X-Git-Tag: tdb-1.2.10~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c12970cc91cb4da8976801e194e29e33e02b340a;p=thirdparty%2Fsamba.git

lib/tdb: fix test/run-die-during-transaction when HAVE_INCOHERENT_MMAP.

Since we force mmap on, we don't intercept writes to the db, so we never
see it in an inconsistent state.  #ifdef over the check that we should have
recovered it at least once.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/lib/tdb/test/run-die-during-transaction.c b/lib/tdb/test/run-die-during-transaction.c
index d6502f4ea40..ae7dafcfac7 100644
--- a/lib/tdb/test/run-die-during-transaction.c
+++ b/lib/tdb/test/run-die-during-transaction.c
@@ -194,7 +194,12 @@ reset:
 		return false;
 	}
 
+#ifdef HAVE_INCOHERENT_MMAP
+	/* This means we always mmap, which makes this test a noop. */
+	ok1(1);
+#else
 	ok1(needed_recovery);
+#endif
 	ok1(locking_errors == 0);
 	ok1(forget_locking() == 0);
 	locking_errors = 0;