From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 13 Sep 2011 22:43:26 +0000 (+0930)
Subject: tdb2: test: convert (non-invasive) run tests to api tests.
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=5e2ad32f810233499913a78ebec99581e0981d8e;p=kai%2Fsamba.git

tdb2: test: convert (non-invasive) run tests to api tests.

This reduces compilation time, since these are merely linked with the
pre-built module, rather than recompiling it into the test (which
allows for fancy things like failtest).

This reduces the test compile time down from about 62 seconds to 45
seconds.  Since ccanlint compiles tests three times (once normally,
once with coverage, and once with reduced config.h) this makes a
difference: we go from 780 seconds to 729 seconds.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit c4ca9f54301c0367891be6330f59fdd5dcdd51d1)
---

diff --git a/lib/tdb2/test/run-12-store.c b/lib/tdb2/test/api-12-store.c
similarity index 92%
rename from lib/tdb2/test/run-12-store.c
rename to lib/tdb2/test/api-12-store.c
index e46183b9c1e..ccec53e029e 100644
--- a/lib/tdb2/test/run-12-store.c
+++ b/lib/tdb2/test/api-12-store.c
@@ -1,5 +1,10 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <ccan/hash/hash.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include "logging.h"
 
 /* We use the same seed which we saw a failure on. */
diff --git a/lib/tdb2/test/run-13-delete.c b/lib/tdb2/test/api-13-delete.c
similarity index 96%
rename from lib/tdb2/test/run-13-delete.c
rename to lib/tdb2/test/api-13-delete.c
index fdbc9db70ae..0287a6abf93 100644
--- a/lib/tdb2/test/run-13-delete.c
+++ b/lib/tdb2/test/api-13-delete.c
@@ -1,4 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/private.h> // For TDB_TOPLEVEL_HASH_BITS
+#include <ccan/hash/hash.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
diff --git a/lib/tdb2/test/run-14-exists.c b/lib/tdb2/test/api-14-exists.c
similarity index 93%
rename from lib/tdb2/test/run-14-exists.c
rename to lib/tdb2/test/api-14-exists.c
index 7ff4514262c..698006faf4a 100644
--- a/lib/tdb2/test/run-14-exists.c
+++ b/lib/tdb2/test/api-14-exists.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 static bool test_records(struct tdb_context *tdb)
diff --git a/lib/tdb2/test/run-16-wipe_all.c b/lib/tdb2/test/api-16-wipe_all.c
similarity index 92%
rename from lib/tdb2/test/run-16-wipe_all.c
rename to lib/tdb2/test/api-16-wipe_all.c
index 27d6f4388c3..d17eff8e6a8 100644
--- a/lib/tdb2/test/run-16-wipe_all.c
+++ b/lib/tdb2/test/api-16-wipe_all.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 static bool add_records(struct tdb_context *tdb)
diff --git a/lib/tdb2/test/run-21-parse_record.c b/lib/tdb2/test/api-21-parse_record.c
similarity index 94%
rename from lib/tdb2/test/run-21-parse_record.c
rename to lib/tdb2/test/api-21-parse_record.c
index c7414a4dcd5..4a9cf05c53c 100644
--- a/lib/tdb2/test/run-21-parse_record.c
+++ b/lib/tdb2/test/api-21-parse_record.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 static enum TDB_ERROR parse(TDB_DATA key, TDB_DATA data, TDB_DATA *expected)
diff --git a/lib/tdb2/test/run-55-transaction.c b/lib/tdb2/test/api-55-transaction.c
similarity index 92%
rename from lib/tdb2/test/run-55-transaction.c
rename to lib/tdb2/test/api-55-transaction.c
index 95545b7e124..9c1044b4e10 100644
--- a/lib/tdb2/test/run-55-transaction.c
+++ b/lib/tdb2/test/api-55-transaction.c
@@ -1,5 +1,10 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/private.h> // struct tdb_context
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-80-tdb_fd.c b/lib/tdb2/test/api-80-tdb_fd.c
similarity index 90%
rename from lib/tdb2/test/run-80-tdb_fd.c
rename to lib/tdb2/test/api-80-tdb_fd.c
index 3b642971fd4..b321f597555 100644
--- a/lib/tdb2/test/run-80-tdb_fd.c
+++ b/lib/tdb2/test/api-80-tdb_fd.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-81-seqnum.c b/lib/tdb2/test/api-81-seqnum.c
similarity index 95%
rename from lib/tdb2/test/run-81-seqnum.c
rename to lib/tdb2/test/api-81-seqnum.c
index 914a850ba60..c41b9ce3dd4 100644
--- a/lib/tdb2/test/run-81-seqnum.c
+++ b/lib/tdb2/test/api-81-seqnum.c
@@ -1,5 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-82-lockattr.c b/lib/tdb2/test/api-82-lockattr.c
similarity index 97%
rename from lib/tdb2/test/run-82-lockattr.c
rename to lib/tdb2/test/api-82-lockattr.c
index acad4399414..048feacfa5e 100644
--- a/lib/tdb2/test/run-82-lockattr.c
+++ b/lib/tdb2/test/api-82-lockattr.c
@@ -1,5 +1,10 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/private.h> // for tdb_fcntl_unlock
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "logging.h"
 
 static int mylock(int fd, int rw, off_t off, off_t len, bool waitflag,
diff --git a/lib/tdb2/test/run-83-openhook.c b/lib/tdb2/test/api-83-openhook.c
similarity index 95%
rename from lib/tdb2/test/run-83-openhook.c
rename to lib/tdb2/test/api-83-openhook.c
index d43f634a694..e7e94738de9 100644
--- a/lib/tdb2/test/run-83-openhook.c
+++ b/lib/tdb2/test/api-83-openhook.c
@@ -1,9 +1,13 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdarg.h>
 #include <err.h>
+#include <unistd.h>
 #include "external-agent.h"
 #include "logging.h"
 
diff --git a/lib/tdb2/test/run-91-get-stats.c b/lib/tdb2/test/api-91-get-stats.c
similarity index 91%
rename from lib/tdb2/test/run-91-get-stats.c
rename to lib/tdb2/test/api-91-get-stats.c
index f00abb3c7db..d9a22ca444e 100644
--- a/lib/tdb2/test/run-91-get-stats.c
+++ b/lib/tdb2/test/api-91-get-stats.c
@@ -1,5 +1,10 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stddef.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-92-get-set-readonly.c b/lib/tdb2/test/api-92-get-set-readonly.c
similarity index 97%
rename from lib/tdb2/test/run-92-get-set-readonly.c
rename to lib/tdb2/test/api-92-get-set-readonly.c
index c8bbe627d8f..483b50d7fd8 100644
--- a/lib/tdb2/test/run-92-get-set-readonly.c
+++ b/lib/tdb2/test/api-92-get-set-readonly.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-93-repack.c b/lib/tdb2/test/api-93-repack.c
similarity index 94%
rename from lib/tdb2/test/run-93-repack.c
rename to lib/tdb2/test/api-93-repack.c
index 906a17b4b34..0a2e6d5b82e 100644
--- a/lib/tdb2/test/run-93-repack.c
+++ b/lib/tdb2/test/api-93-repack.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 #define NUM_TESTS 50000
diff --git a/lib/tdb2/test/run-add-remove-flags.c b/lib/tdb2/test/api-add-remove-flags.c
similarity index 93%
rename from lib/tdb2/test/run-add-remove-flags.c
rename to lib/tdb2/test/api-add-remove-flags.c
index e0f018b838f..231b9f6cfee 100644
--- a/lib/tdb2/test/run-add-remove-flags.c
+++ b/lib/tdb2/test/api-add-remove-flags.c
@@ -1,5 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/private.h> // for tdb_context
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-check-callback.c b/lib/tdb2/test/api-check-callback.c
similarity index 95%
rename from lib/tdb2/test/run-check-callback.c
rename to lib/tdb2/test/api-check-callback.c
index 112e368e5b6..fb980f2276b 100644
--- a/lib/tdb2/test/run-check-callback.c
+++ b/lib/tdb2/test/api-check-callback.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 #define NUM_RECORDS 1000
diff --git a/lib/tdb2/test/run-firstkey-nextkey.c b/lib/tdb2/test/api-firstkey-nextkey.c
similarity index 97%
rename from lib/tdb2/test/run-firstkey-nextkey.c
rename to lib/tdb2/test/api-firstkey-nextkey.c
index 816ff42fd1c..0c0951416fc 100644
--- a/lib/tdb2/test/run-firstkey-nextkey.c
+++ b/lib/tdb2/test/api-firstkey-nextkey.c
@@ -1,5 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include "logging.h"
 
 #define NUM_RECORDS 1000
diff --git a/lib/tdb2/test/run-fork-test.c b/lib/tdb2/test/api-fork-test.c
similarity index 97%
rename from lib/tdb2/test/run-fork-test.c
rename to lib/tdb2/test/api-fork-test.c
index 7ff71366cf6..6feb618c721 100644
--- a/lib/tdb2/test/run-fork-test.c
+++ b/lib/tdb2/test/api-fork-test.c
@@ -10,10 +10,15 @@
  * Note that we don't hold a lock across tdb_traverse callbacks, so
  * that doesn't matter.
  */
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/types.h>
 #include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include "logging.h"
 
 static enum TDB_ERROR fork_in_parse(TDB_DATA key, TDB_DATA data,
diff --git a/lib/tdb2/test/run-locktimeout.c b/lib/tdb2/test/api-locktimeout.c
similarity index 96%
rename from lib/tdb2/test/run-locktimeout.c
rename to lib/tdb2/test/api-locktimeout.c
index dd82f1482d0..21a26c46fee 100644
--- a/lib/tdb2/test/run-locktimeout.c
+++ b/lib/tdb2/test/api-locktimeout.c
@@ -1,5 +1,11 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <errno.h>
 #include "logging.h"
 #include "external-agent.h"
 
diff --git a/lib/tdb2/test/run-missing-entries.c b/lib/tdb2/test/api-missing-entries.c
similarity index 90%
rename from lib/tdb2/test/run-missing-entries.c
rename to lib/tdb2/test/api-missing-entries.c
index 22d6ba4270a..1932947a3a8 100644
--- a/lib/tdb2/test/run-missing-entries.c
+++ b/lib/tdb2/test/api-missing-entries.c
@@ -1,6 +1,10 @@
-#include "tdb2-source.h"
 /* Another test revealed that we lost an entry.  This reproduces it. */
+#include <ccan/tdb2/tdb2.h>
+#include <ccan/hash/hash.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 #define NUM_RECORDS 1189
diff --git a/lib/tdb2/test/run-open-multiple-times.c b/lib/tdb2/test/api-open-multiple-times.c
similarity index 95%
rename from lib/tdb2/test/run-open-multiple-times.c
rename to lib/tdb2/test/api-open-multiple-times.c
index 4d60b202799..16562069dc3 100644
--- a/lib/tdb2/test/run-open-multiple-times.c
+++ b/lib/tdb2/test/api-open-multiple-times.c
@@ -1,5 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-record-expand.c b/lib/tdb2/test/api-record-expand.c
similarity index 92%
rename from lib/tdb2/test/run-record-expand.c
rename to lib/tdb2/test/api-record-expand.c
index 620294446b2..48ad1cdf22d 100644
--- a/lib/tdb2/test/run-record-expand.c
+++ b/lib/tdb2/test/api-record-expand.c
@@ -1,5 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include "logging.h"
 
 #define MAX_SIZE 10000
diff --git a/lib/tdb2/test/run-simple-delete.c b/lib/tdb2/test/api-simple-delete.c
similarity index 92%
rename from lib/tdb2/test/run-simple-delete.c
rename to lib/tdb2/test/api-simple-delete.c
index ad7e0153d0d..a5b65d605e9 100644
--- a/lib/tdb2/test/run-simple-delete.c
+++ b/lib/tdb2/test/api-simple-delete.c
@@ -1,5 +1,8 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/tdb2/test/run-summary.c b/lib/tdb2/test/api-summary.c
similarity index 93%
rename from lib/tdb2/test/run-summary.c
rename to lib/tdb2/test/api-summary.c
index 33012bae1ee..e0e292ea397 100644
--- a/lib/tdb2/test/run-summary.c
+++ b/lib/tdb2/test/api-summary.c
@@ -1,5 +1,9 @@
-#include "tdb2-source.h"
+#include <ccan/tdb2/tdb2.h>
 #include <ccan/tap/tap.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])