Browse Source

tdb2: make tests include a single mega-header to simplify future patches

This lets us add the new files to a single place.
Rusty Russell 14 years ago
parent
commit
476567430b
50 changed files with 60 additions and 408 deletions
  1. 1 8
      ccan/tdb2/test/run-001-encode.c
  2. 1 8
      ccan/tdb2/test/run-001-fls.c
  3. 1 8
      ccan/tdb2/test/run-01-new_database.c
  4. 1 8
      ccan/tdb2/test/run-02-expand.c
  5. 1 8
      ccan/tdb2/test/run-03-coalesce.c
  6. 1 8
      ccan/tdb2/test/run-04-basichash.c
  7. 1 8
      ccan/tdb2/test/run-05-readonly-open.c
  8. 1 8
      ccan/tdb2/test/run-10-simple-store.c
  9. 1 8
      ccan/tdb2/test/run-11-simple-fetch.c
  10. 1 8
      ccan/tdb2/test/run-12-store.c
  11. 1 8
      ccan/tdb2/test/run-13-delete.c
  12. 1 8
      ccan/tdb2/test/run-14-exists.c
  13. 1 8
      ccan/tdb2/test/run-15-append.c
  14. 1 9
      ccan/tdb2/test/run-16-wipe_all.c
  15. 1 8
      ccan/tdb2/test/run-20-growhash.c
  16. 1 8
      ccan/tdb2/test/run-21-parse_record.c
  17. 1 9
      ccan/tdb2/test/run-25-hashoverload.c
  18. 1 8
      ccan/tdb2/test/run-30-exhaust-before-expand.c
  19. 1 8
      ccan/tdb2/test/run-35-convert.c
  20. 1 8
      ccan/tdb2/test/run-50-multiple-freelists.c
  21. 1 8
      ccan/tdb2/test/run-55-transaction.c
  22. 1 8
      ccan/tdb2/test/run-56-open-during-transaction.c
  23. 2 8
      ccan/tdb2/test/run-57-die-during-transaction.c
  24. 1 9
      ccan/tdb2/test/run-64-bit-tdb.c
  25. 1 8
      ccan/tdb2/test/run-80-tdb_fd.c
  26. 1 9
      ccan/tdb2/test/run-81-seqnum.c
  27. 1 9
      ccan/tdb2/test/run-82-lockattr.c
  28. 1 8
      ccan/tdb2/test/run-83-openhook.c
  29. 1 9
      ccan/tdb2/test/run-90-get-set-attributes.c
  30. 1 9
      ccan/tdb2/test/run-91-get-stats.c
  31. 1 9
      ccan/tdb2/test/run-92-get-set-readonly.c
  32. 1 9
      ccan/tdb2/test/run-add-remove-flags.c
  33. 1 9
      ccan/tdb2/test/run-check-callback.c
  34. 1 8
      ccan/tdb2/test/run-expand-in-transaction.c
  35. 1 9
      ccan/tdb2/test/run-features.c
  36. 1 9
      ccan/tdb2/test/run-firstkey-nextkey.c
  37. 1 8
      ccan/tdb2/test/run-fork-test.c
  38. 1 8
      ccan/tdb2/test/run-lockall.c
  39. 1 8
      ccan/tdb2/test/run-locktimeout.c
  40. 1 9
      ccan/tdb2/test/run-missing-entries.c
  41. 1 8
      ccan/tdb2/test/run-open-multiple-times.c
  42. 1 8
      ccan/tdb2/test/run-record-expand.c
  43. 1 9
      ccan/tdb2/test/run-remap-in-read_traverse.c
  44. 1 8
      ccan/tdb2/test/run-seed.c
  45. 1 8
      ccan/tdb2/test/run-simple-delete.c
  46. 1 9
      ccan/tdb2/test/run-summary.c
  47. 1 8
      ccan/tdb2/test/run-tdb_errorstr.c
  48. 1 8
      ccan/tdb2/test/run-tdb_foreach.c
  49. 1 9
      ccan/tdb2/test/run-traverse.c
  50. 10 0
      ccan/tdb2/test/tdb2-source.h

+ 1 - 8
ccan/tdb2/test/run-001-encode.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-001-fls.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 
 static unsigned int dumb_fls(uint64_t num)

+ 1 - 8
ccan/tdb2/test/run-01-new_database.c

@@ -1,12 +1,5 @@
 #include <ccan/failtest/failtest_override.h>
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-02-expand.c

@@ -1,12 +1,5 @@
 #include <ccan/failtest/failtest_override.h>
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/hash.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-03-coalesce.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 #include "layout.h"

+ 1 - 8
ccan/tdb2/test/run-04-basichash.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-05-readonly-open.c

@@ -1,12 +1,5 @@
 #include <ccan/failtest/failtest_override.h>
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-10-simple-store.c

@@ -1,12 +1,5 @@
 #include <ccan/failtest/failtest_override.h>
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-11-simple-fetch.c

@@ -1,12 +1,5 @@
 #include <ccan/failtest/failtest_override.h>
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-12-store.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-13-delete.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-14-exists.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-15-append.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/ilog/ilog.h>
 #include "logging.h"

+ 1 - 9
ccan/tdb2/test/run-16-wipe_all.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-20-growhash.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-21-parse_record.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-25-hashoverload.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-30-exhaust-before-expand.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <err.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-35-convert.c

@@ -1,13 +1,6 @@
 #include <ccan/tdb2/private.h>
 #include <ccan/failtest/failtest_override.h>
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/failtest/failtest.h>
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-50-multiple-freelists.c

@@ -1,12 +1,5 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
-#include <ccan/tdb2/transaction.c>
 #include "logging.h"
 #include "layout.h"
 

+ 1 - 8
ccan/tdb2/test/run-55-transaction.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-56-open-during-transaction.c

@@ -11,14 +11,7 @@ static int ftruncate_check(int fd, off_t length);
 #define fcntl fcntl_with_lockcheck
 #define ftruncate ftruncate_check
 
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>

+ 2 - 8
ccan/tdb2/test/run-57-die-during-transaction.c

@@ -58,14 +58,8 @@ static void free_all(void)
 #define malloc malloc_noleak
 #define free free_noleak
 
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
+
 #undef malloc
 #undef free
 #undef write

+ 1 - 9
ccan/tdb2/test/run-64-bit-tdb.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-80-tdb_fd.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-81-seqnum.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-82-lockattr.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-83-openhook.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>

+ 1 - 9
ccan/tdb2/test/run-90-get-set-attributes.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-91-get-stats.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-92-get-set-readonly.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/traverse.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-add-remove-flags.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-check-callback.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/open.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-expand-in-transaction.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-features.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/summary.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-firstkey-nextkey.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-fork-test.c

@@ -10,14 +10,7 @@
  * Note that we don't hold a lock across tdb_traverse callbacks, so
  * that doesn't matter.
  */
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+ 1 - 8
ccan/tdb2/test/run-lockall.c

@@ -3,15 +3,8 @@
 #include "lock-tracking.h"
 
 #define fcntl fcntl_with_lockcheck
+#include "tdb2-source.h"
 
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>

+ 1 - 8
ccan/tdb2/test/run-locktimeout.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 #include "external-agent.h"

+ 1 - 9
ccan/tdb2/test/run-missing-entries.c

@@ -1,13 +1,5 @@
+#include "tdb2-source.h"
 /* Another test revealed that we lost an entry.  This reproduces it. */
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-open-multiple-times.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-record-expand.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-remap-in-read_traverse.c

@@ -1,14 +1,6 @@
+#include "tdb2-source.h"
 /* We had a bug where we marked the tdb read-only for a tdb_traverse_read.
  * If we then expanded the tdb, we would remap read-only, and later SEGV. */
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
 #include <ccan/tap/tap.h>
 #include "external-agent.h"
 #include "logging.h"

+ 1 - 8
ccan/tdb2/test/run-seed.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-simple-delete.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-summary.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/summary.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 8
ccan/tdb2/test/run-tdb_errorstr.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 
 int main(int argc, char *argv[])

+ 1 - 8
ccan/tdb2/test/run-tdb_foreach.c

@@ -1,11 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/transaction.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 1 - 9
ccan/tdb2/test/run-traverse.c

@@ -1,12 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/open.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/traverse.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 

+ 10 - 0
ccan/tdb2/test/tdb2-source.h

@@ -0,0 +1,10 @@
+#include <ccan/tdb2/check.c>
+#include <ccan/tdb2/free.c>
+#include <ccan/tdb2/hash.c>
+#include <ccan/tdb2/io.c>
+#include <ccan/tdb2/lock.c>
+#include <ccan/tdb2/open.c>
+#include <ccan/tdb2/summary.c>
+#include <ccan/tdb2/tdb.c>
+#include <ccan/tdb2/transaction.c>
+#include <ccan/tdb2/traverse.c>