From eafd83736918bc5953e4a91cf2d893e68f2da2a2 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 21 Mar 2012 00:57:14 +1030 Subject: [PATCH] lib/tdb: fix up run-die-during-transaction test cases on Solaris. By using a different include order, we end up with a different version of FILE_OFFSET_BITS (and probably other things) in parts of the test. The different variants get linked together, and the result is weird: the stat returns 0 size. Signed-off-by: Rusty Russell --- lib/tdb/test/run-die-during-transaction.c | 3 +-- lib/tdb/test/run-nested-traverse.c | 2 +- lib/tdb/test/run-no-lock-during-traverse.c | 2 +- lib/tdb/test/run-traverse-in-transaction.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/tdb/test/run-die-during-transaction.c b/lib/tdb/test/run-die-during-transaction.c index e65f8111193..d6502f4ea40 100644 --- a/lib/tdb/test/run-die-during-transaction.c +++ b/lib/tdb/test/run-die-during-transaction.c @@ -1,4 +1,4 @@ -#include +#include "../common/tdb_private.h" #include "lock-tracking.h" static ssize_t pwrite_check(int fd, const void *buf, size_t count, off_t offset); static ssize_t write_check(int fd, const void *buf, size_t count); @@ -9,7 +9,6 @@ static int ftruncate_check(int fd, off_t length); #define fcntl fcntl_with_lockcheck #define ftruncate ftruncate_check -#include "../common/tdb_private.h" #include "../common/io.c" #include "../common/tdb.c" #include "../common/lock.c" diff --git a/lib/tdb/test/run-nested-traverse.c b/lib/tdb/test/run-nested-traverse.c index 1742b111081..83efd0d8ca8 100644 --- a/lib/tdb/test/run-nested-traverse.c +++ b/lib/tdb/test/run-nested-traverse.c @@ -1,6 +1,6 @@ +#include "../common/tdb_private.h" #include "lock-tracking.h" #define fcntl fcntl_with_lockcheck -#include "../common/tdb_private.h" #include "../common/io.c" #include "../common/tdb.c" #include "../common/lock.c" diff --git a/lib/tdb/test/run-no-lock-during-traverse.c b/lib/tdb/test/run-no-lock-during-traverse.c index 21e6d88e9cf..25d9d784bf5 100644 --- a/lib/tdb/test/run-no-lock-during-traverse.c +++ b/lib/tdb/test/run-no-lock-during-traverse.c @@ -1,8 +1,8 @@ +#include "../common/tdb_private.h" #include "lock-tracking.h" #define fcntl fcntl_with_lockcheck -#include "../common/tdb_private.h" #include "../common/io.c" #include "../common/tdb.c" #include "../common/lock.c" diff --git a/lib/tdb/test/run-traverse-in-transaction.c b/lib/tdb/test/run-traverse-in-transaction.c index 44c3dabc917..d8455176a24 100644 --- a/lib/tdb/test/run-traverse-in-transaction.c +++ b/lib/tdb/test/run-traverse-in-transaction.c @@ -1,6 +1,6 @@ #include "lock-tracking.h" -#define fcntl fcntl_with_lockcheck #include "../common/tdb_private.h" +#define fcntl fcntl_with_lockcheck #include "../common/io.c" #include "../common/tdb.c" #include "../common/lock.c" -- 2.34.1