From: Rusty Russell Date: Fri, 22 Jun 2012 05:37:44 +0000 (+0930) Subject: tdb: don't use err.h in tests. X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=3c4263e7580143c69225729f5b67f09c00add2fd tdb: don't use err.h in tests. It's not portable. While we could use ccan/err, it seems overkill since we actually only use it in one test (I obviously cut & paste the #include). Signed-off-by: Rusty Russell Autobuild-User(master): Rusty Russell Autobuild-Date(master): Fri Jun 22 09:22:28 CEST 2012 on sn-devel-104 --- diff --git a/lib/tdb/test/external-agent.c b/lib/tdb/test/external-agent.c index d3fe8913fa58..139de76f9ad0 100644 --- a/lib/tdb/test/external-agent.c +++ b/lib/tdb/test/external-agent.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -138,7 +137,7 @@ struct agent *prepare_external_agent(void) result = do_operation(name[0], name+1); if (write(response[1], &result, sizeof(result)) != sizeof(result)) - err(1, "Writing response"); + abort(); } exit(0); } diff --git a/lib/tdb/test/run-3G-file.c b/lib/tdb/test/run-3G-file.c index 3b4e45739a11..3ee9de15ed74 100644 --- a/lib/tdb/test/run-3G-file.c +++ b/lib/tdb/test/run-3G-file.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" static int tdb_expand_file_sparse(struct tdb_context *tdb, diff --git a/lib/tdb/test/run-bad-tdb-header.c b/lib/tdb/test/run-bad-tdb-header.c index 9dbb6225c91c..b00fb8934a45 100644 --- a/lib/tdb/test/run-bad-tdb-header.c +++ b/lib/tdb/test/run-bad-tdb-header.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run-check.c b/lib/tdb/test/run-check.c index 455731db9441..05f7aecd0839 100644 --- a/lib/tdb/test/run-check.c +++ b/lib/tdb/test/run-check.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run-corrupt.c b/lib/tdb/test/run-corrupt.c index 5d86e71498be..584f789bf807 100644 --- a/lib/tdb/test/run-corrupt.c +++ b/lib/tdb/test/run-corrupt.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" static int check(TDB_DATA key, TDB_DATA data, void *private) diff --git a/lib/tdb/test/run-die-during-transaction.c b/lib/tdb/test/run-die-during-transaction.c index ae7dafcfac7e..19c9dbebf93c 100644 --- a/lib/tdb/test/run-die-during-transaction.c +++ b/lib/tdb/test/run-die-during-transaction.c @@ -23,7 +23,6 @@ static int ftruncate_check(int fd, off_t length); #include #include #include -#include #include #include "external-agent.h" #include "logging.h" diff --git a/lib/tdb/test/run-endian.c b/lib/tdb/test/run-endian.c index bf6e71389f8a..b19ffd373f1f 100644 --- a/lib/tdb/test/run-endian.c +++ b/lib/tdb/test/run-endian.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run-incompatible.c b/lib/tdb/test/run-incompatible.c index 6097026b49a4..628927c88687 100644 --- a/lib/tdb/test/run-incompatible.c +++ b/lib/tdb/test/run-incompatible.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include static unsigned int tdb_dumb_hash(TDB_DATA *key) { diff --git a/lib/tdb/test/run-nested-transactions.c b/lib/tdb/test/run-nested-transactions.c index 45bc56338daa..8c84bcac836a 100644 --- a/lib/tdb/test/run-nested-transactions.c +++ b/lib/tdb/test/run-nested-transactions.c @@ -12,7 +12,6 @@ #include "tap-interface.h" #include #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run-nested-traverse.c b/lib/tdb/test/run-nested-traverse.c index 83efd0d8ca87..86f291345570 100644 --- a/lib/tdb/test/run-nested-traverse.c +++ b/lib/tdb/test/run-nested-traverse.c @@ -15,7 +15,6 @@ #undef fcntl #include #include -#include #include "external-agent.h" #include "logging.h" diff --git a/lib/tdb/test/run-no-lock-during-traverse.c b/lib/tdb/test/run-no-lock-during-traverse.c index 25d9d784bf58..0a72282eb6d8 100644 --- a/lib/tdb/test/run-no-lock-during-traverse.c +++ b/lib/tdb/test/run-no-lock-during-traverse.c @@ -15,7 +15,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" #undef fcntl diff --git a/lib/tdb/test/run-oldhash.c b/lib/tdb/test/run-oldhash.c index 22c6d13c179c..535336cb473c 100644 --- a/lib/tdb/test/run-oldhash.c +++ b/lib/tdb/test/run-oldhash.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run-open-during-transaction.c b/lib/tdb/test/run-open-during-transaction.c index f4a00525d8d9..d46b216ccdc5 100644 --- a/lib/tdb/test/run-open-during-transaction.c +++ b/lib/tdb/test/run-open-during-transaction.c @@ -24,7 +24,6 @@ static int ftruncate_check(int fd, off_t length); #include #include #include -#include #include "external-agent.h" #include "logging.h" diff --git a/lib/tdb/test/run-readonly-check.c b/lib/tdb/test/run-readonly-check.c index b4b85fb7c71e..fdd9507cdad2 100644 --- a/lib/tdb/test/run-readonly-check.c +++ b/lib/tdb/test/run-readonly-check.c @@ -13,7 +13,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run-rwlock-check.c b/lib/tdb/test/run-rwlock-check.c index d7a86cd2c980..8b8072db1e67 100644 --- a/lib/tdb/test/run-rwlock-check.c +++ b/lib/tdb/test/run-rwlock-check.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include static void log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) { diff --git a/lib/tdb/test/run-summary.c b/lib/tdb/test/run-summary.c index 089338ce9c63..22312843e79e 100644 --- a/lib/tdb/test/run-summary.c +++ b/lib/tdb/test/run-summary.c @@ -12,7 +12,6 @@ #include "../common/summary.c" #include "tap-interface.h" #include -#include int main(int argc, char *argv[]) { diff --git a/lib/tdb/test/run-transaction-expand.c b/lib/tdb/test/run-transaction-expand.c index bc22d2b53e47..7f7b3fc12957 100644 --- a/lib/tdb/test/run-transaction-expand.c +++ b/lib/tdb/test/run-transaction-expand.c @@ -39,7 +39,6 @@ static inline int fake_fdatasync(int fd) #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" static void write_record(struct tdb_context *tdb, size_t extra_len, diff --git a/lib/tdb/test/run-traverse-in-transaction.c b/lib/tdb/test/run-traverse-in-transaction.c index d8455176a245..7813a6ce9a54 100644 --- a/lib/tdb/test/run-traverse-in-transaction.c +++ b/lib/tdb/test/run-traverse-in-transaction.c @@ -15,7 +15,6 @@ #undef fcntl_with_lockcheck #include #include -#include #include "external-agent.h" #include "logging.h" diff --git a/lib/tdb/test/run-wronghash-fail.c b/lib/tdb/test/run-wronghash-fail.c index e37aafdd9ee8..74bbc30ba6fb 100644 --- a/lib/tdb/test/run-wronghash-fail.c +++ b/lib/tdb/test/run-wronghash-fail.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include static void log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) { diff --git a/lib/tdb/test/run-zero-append.c b/lib/tdb/test/run-zero-append.c index 0ef30737ba6c..36bf6990f53e 100644 --- a/lib/tdb/test/run-zero-append.c +++ b/lib/tdb/test/run-zero-append.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[]) diff --git a/lib/tdb/test/run.c b/lib/tdb/test/run.c index 89e55b7f6545..f49e85055e56 100644 --- a/lib/tdb/test/run.c +++ b/lib/tdb/test/run.c @@ -11,7 +11,6 @@ #include "../common/hash.c" #include "tap-interface.h" #include -#include #include "logging.h" int main(int argc, char *argv[])