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 e46183b9c1e8875ce1b2265fdc9922e985f51871..ccec53e029ef8d93dcb995436de539bda10a9e28 100644 (file)
--- 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 fdbc9db70aefaba4f91982e192b425b065c445ff..0287a6abf93c93217ef0756a1012f0048775d1a5 100644 (file)
--- 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 7ff4514262c02228fc88e23a999b9fa744d0bccd..698006faf4ac946b7b813283d64cbc7fd57d5945 100644 (file)
--- 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 27d6f4388c37ffcda1490adb1903fe84532b7fb6..d17eff8e6a8cac343fd584f88f368a571124b7e7 100644 (file)
--- 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 c7414a4dcd5594cd1c4a0eb480b6b59fa0b51e65..4a9cf05c53c0057a33ce6add3c172b526e1f4c9d 100644 (file)
--- 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 95545b7e1246e8f7a53d3d9d2e687da5fd479b93..9c1044b4e10cf5160b1c89daf7bef330f74f3192 100644 (file)
--- 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 3b642971fd42b8d7b3a34416b16443c24081b342..b321f5975557e71cc61bc70e98bd24e55f2f0cb6 100644 (file)
--- 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 914a850ba60e8f27a96b8bd79444c3816dbcaace..c41b9ce3dd40f7444b57407f209bdbd7e8884bf2 100644 (file)
--- 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 acad4399414d14b7859dd7b26a7ebdf1b3f518d3..048feacfa5ed665bb8154aaf98c04ed805f467fb 100644 (file)
--- 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 d43f634a6947a432cdb5a8f560af2d30f4525b8f..e7e94738de9c6609fc2f07152d8322899a4946fc 100644 (file)
--- 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 f00abb3c7db03f0f5749927af917613da98c1376..d9a22ca444eaa81f9c75c683876e00f1e937f29c 100644 (file)
--- 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 c8bbe627d8ff4a971a24c60f897d51203b7c3fc7..483b50d7fd8c47c3d3f71ce611244583c74be7e4 100644 (file)
--- 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 906a17b4b34d775a7d955a03dbcb76b760db913a..0a2e6d5b82e79ac943ddca47807e2b15430d2c45 100644 (file)
--- 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 e0f018b838f0588d0a0096a41a59fa85585b1160..231b9f6cfeef348d110b7c432bd9031f7a8a1409 100644 (file)
--- 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 112e368e5b613d0e744ad6d0f7668b22623373d5..fb980f2276bd50ec111056d9c34286d88ee63d4b 100644 (file)
--- 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 816ff42fd1cf82107b8fc0b3ff35a5db876d4ab9..0c0951416fc0600243ae8e130e2016449a3529d4 100644 (file)
--- 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 7ff71366cf6a39d1d34da26cbcacf3bf53c0c902..6feb618c72104b2765b299fca54f6f1c8103642f 100644 (file)
--- 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 dd82f1482d0b74bcd7dc0a0b293999381b52b6c8..21a26c46fee85d28800298ecca5881dacbf43ad3 100644 (file)
--- 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 22d6ba4270af6b22277fc8aa2356b82039c19f41..1932947a3a894a90fde7a848838406c91e7e2e9c 100644 (file)
--- 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 4d60b2027993883dddbfa92aba8c2287196d8962..16562069dc3ce3dccc3134e56f3df72597c5a30b 100644 (file)
--- 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 620294446b2d0434fdc3d7062da7f92e711651de..48ad1cdf22d100bfddeeaff348a6093c3a0b4dbc 100644 (file)
--- 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 ad7e0153d0dd1bcbf57ed5626808e41c505e1c40..a5b65d605e9c2e37c7feb9b184e4ee2b341662ba 100644 (file)
--- 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 33012bae1ee6ed9b9e631fe7b34823f465c270f1..e0e292ea397b3edcb3e3d7a8bb835c93c55fc896 100644 (file)
--- 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[])