Major cleanup of makefiles, api tests.

We no longer use libccan for tests, but explicit object lists.  This
will catch missing dependencies.  API tests *do* get the module object
linked in now.
In addition, makefiles now correctly rebuild when a dependency changes
(gcc's -MD here), and when _info.c changes.

diff --git a/.bzrignore b/.bzrignore
index 54becb0d0bd9ee33df55568e6cc2f05b485b9e20..681d0a15df084b9853117847660251a179812469 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,5 +1,6 @@
 _info
 .depends
 _info
 .depends

+*.d

 *~
 tools/ccan_depends
 tools/doc_extract
 *~
 tools/ccan_depends
 tools/doc_extract

diff --git a/Makefile b/Makefile
index 146a516ac97f0ba9f1028a9ec2bf80664fde178f..55d5f5ede3269af8928cb3689613918aa2541dc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
 # 
 # check: run tests on all ccan modules (use 'make check V=--verbose' for more)
 #        Includes building libccan.a.
 # 
 # check: run tests on all ccan modules (use 'make check V=--verbose' for more)
 #        Includes building libccan.a.

+# libccan.a: A library with all the ccan modules in it.

 # tools: build useful tools in tools/ dir.
 #        Especially tools/ccanlint/ccanlint and tools/namespacize.
 # distclean: destroy everything back to pristine state
 # tools: build useful tools in tools/ dir.
 #        Especially tools/ccanlint/ccanlint and tools/namespacize.
 # distclean: destroy everything back to pristine state


@@ -13,39 +14,38 @@ ALL=$(patsubst ccan/%/test, %, $(wildcard ccan/*/test))
 ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
 
 ALL_DIRS=$(patsubst %, ccan/%, $(ALL))
 ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
 

+default: libccan.a
+

 include Makefile-ccan
 
 include Makefile-ccan
 

-check: $(ALL_DIRS:%=test-%)
+check: $(ALL_DIRS:ccan/%=check-%)

 
 distclean: clean
        rm -f $(ALL_DEPENDS)
 
 
 distclean: clean
        rm -f $(ALL_DEPENDS)
 

-# Override implicit attempt to link directory.
-$(ALL_DIRS):
-       @touch $@
-
-$(ALL_DEPENDS): %/.depends: tools/ccan_depends
-       tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )
+$(ALL_DEPENDS): %/.depends: %/_info.c tools/ccan_depends
+       @tools/ccan_depends $* > $@ || ( rm -f $@; exit 1 )

 
 

-test-ccan/%: tools/run_tests libccan.a(%.o)
+# Actual dependencies are created in inter-depends
+check-%: tools/run_tests

        @echo Testing $*...
        @echo Testing $*...

-       @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+       @if tools/run_tests $(V) `[ ! -f ccan/$*.o ] || echo --apiobj=ccan/$*.o` ccan/$* $(filter-out ccan/$*.o, $(filter %.o, $^)) | grep ^'not ok'; then exit 1; else exit 0; fi

 
 

-# Some don't have object files.
-test-ccan/%:: tools/run_tests
-       @echo Testing $*...
-       @if tools/run_tests $(V) ccan/$* | grep ^'not ok'; then exit 1; else exit 0; fi
+libccan.a(%.o): ccan/%.o
+       $(AR) r $@ $<

 
 clean: tools-clean
 
 clean: tools-clean

-       $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info`
+       $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name _info` `find . -name '*.d'`

        $(RM) inter-depends lib-depends test-depends
 
        $(RM) inter-depends lib-depends test-depends
 

-# Only list a dependency if there are object files to build.
-inter-depends: $(ALL_DEPENDS)
-       for f in $(ALL_DEPENDS); do echo test-ccan/$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f); do [ "$$(echo $$dir/[a-z]*.c)" = "$$dir/[a-z]*.c" ] || echo libccan.a\("$$(basename $$dir)".o\); done); done > $@
+# Creates a dependency from the tests to the object files which it needs.
+inter-depends: $(ALL_DEPENDS) Makefile
+       @for f in $(ALL_DEPENDS); do echo check-$$(basename $$(dirname $$f) ): $$(for dir in $$(cat $$f) $$(dirname $$f); do [ "$$(echo $$dir/[a-z]*.c)" = "$$dir/[a-z]*.c" ] || echo ccan/"$$(basename $$dir)".o; done); done > $@

 
 

-test-depends: $(ALL_DEPENDS)
-       for f in $(ALL_DEPENDS); do echo test-ccan/`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),test-ccan/\1,p' < $$f`; done > $@
+# Creates dependencies between tests, so if foo depends on bar, bar is tested
+# first 
+test-depends: $(ALL_DEPENDS) Makefile
+       @for f in $(ALL_DEPENDS); do echo check-`basename \`dirname $$f\``: `sed -n 's,ccan/\(.*\),check-\1,p' < $$f`; done > $@

 
 include tools/Makefile
 -include inter-depends
 
 include tools/Makefile
 -include inter-depends

diff --git a/Makefile-ccan b/Makefile-ccan
index 0396ac22c1fe4410399279e7e1dd900b4160eeef..68f7d02dd291948232441ad3e29d4acfb2265fd2 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -1,11 +1,23 @@
-# Example makefile which makes a "libccan.a" of everything under ccan/
-# You could just do:
-#      SRCFILES += $(shell find ccan/ -name '[a-z]*.c')
+# Example makefile which makes a "libccan.a" of everything under ccan/.
+# For simple projects you could just do:
+#      SRCFILES += $(wildcard ccan/*/[a-z]*.c)

 
 

-CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I.
+CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I. $(DEPGEN)

 
 

-CFILES=$(wildcard ccan/*/[a-z]*.c)
-OBJFILES=$(CFILES:.c=.o)
+# Automatic dependency generation: makes ccan/*.d files.
+DEPGEN=-MD
+-include ccan/*.d
+
+# Every directory with .c files (other than _info.c) is included.
+DIRS=$(patsubst %/, %, $(sort $(dir $(wildcard ccan/*/[a-z]*.c))))
+
+# We compile all the ccan/foo/*.o files together into ccan/foo.o
+OBJFILES=$(DIRS:=.o)

 
 libccan.a: $(OBJFILES)
        $(AR) r $@ $^
 
 libccan.a: $(OBJFILES)
        $(AR) r $@ $^

+
+# Dependencies are autogenerated in the .d files.
+$(OBJFILES): %.o:
+       $(CC) $(CFLAGS) -c -o $@ $*/[a-z]*.c
+

diff --git a/Makefile-web b/Makefile-web
index a14b11ab1083abf1a5d146ec0c66f6f348ea6acf..79988982a52c34f8527f7fae86bcf36ca862045a 100644 (file)
--- a/Makefile-web
+++ b/Makefile-web
@@ -10,6 +10,7 @@ JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
 
 upload: check webpages
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
 
 upload: check webpages

+       bzr push

        send-web # Rusty's upload script.
        
 webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(ALL_PAGES) $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(JUNKPAGES) $(JUNKBALLS)
        send-web # Rusty's upload script.
        
 webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(ALL_PAGES) $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(JUNKPAGES) $(JUNKBALLS)

diff --git a/ccan/antithread/_info.c b/ccan/antithread/_info.c
index 87a16ab5add45b540c2701e8ae50f10f13086a5e..24b4e997e0045aa08adbf7fe8902abec8ea4ffde 100644 (file)
--- a/ccan/antithread/_info.c
+++ b/ccan/antithread/_info.c
@@ -18,6 +18,7 @@ int main(int argc, char *argv[])
                printf("ccan/talloc\n");
                printf("ccan/alloc\n");
                printf("ccan/noerr\n");
                printf("ccan/talloc\n");
                printf("ccan/alloc\n");
                printf("ccan/noerr\n");

+               printf("ccan/read_write_all\n"); /* For tests */

                return 0;
        }
 
                return 0;
        }
 

diff --git a/ccan/crc/test/api.c b/ccan/crc/test/api.c
index 4e8428b8a1a65bbdc68b3f07bc922001a6739a11..c357a2cd6a252d332cd4eb1e0d552307c4fff227 100644 (file)
--- a/ccan/crc/test/api.c
+++ b/ccan/crc/test/api.c
@@ -1,8 +1,119 @@
 #include "crc/crc.h"
 #include "crc/crc.h"

-#include "crc/crc.c"

 #include "tap/tap.h"
 #include <string.h>
 
 #include "tap/tap.h"
 #include <string.h>
 

+static const uint32_t crc32c_tab[] = {
+       0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
+       0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
+       0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+       0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
+       0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,
+       0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+       0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,
+       0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
+       0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+       0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
+       0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,
+       0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+       0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,
+       0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
+       0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+       0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
+       0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,
+       0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+       0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,
+       0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
+       0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+       0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
+       0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,
+       0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+       0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,
+       0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
+       0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+       0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
+       0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,
+       0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+       0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,
+       0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
+       0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+       0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
+       0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,
+       0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+       0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,
+       0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
+       0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+       0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
+       0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,
+       0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+       0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,
+       0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
+       0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+       0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
+       0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,
+       0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+       0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,
+       0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
+       0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+       0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
+       0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,
+       0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+       0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,
+       0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
+       0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+       0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
+       0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,
+       0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+       0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,
+       0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
+       0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+       0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351
+};
+
+static const uint32_t crc32_ieee_tab[] = {
+       0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+       0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+       0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+       0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+       0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+       0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+       0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+       0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+       0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+       0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+       0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+       0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+       0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+       0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+       0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+       0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+       0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+       0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+       0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+       0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+       0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+       0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+       0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+       0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+       0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+       0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+       0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+       0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+       0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+       0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+       0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+       0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+       0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+       0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+       0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+       0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+       0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+       0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+       0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+       0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+       0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+       0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+       0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};

 /* Expected CRCs of 4 of each char. */
 static uint32_t crcc_expect[] = {
        0x00000000, 0x99cd23b2, 0x36763195, 0xafbb1227, 0x6cec632a, 0xf5214098, 
 /* Expected CRCs of 4 of each char. */
 static uint32_t crcc_expect[] = {
        0x00000000, 0x99cd23b2, 0x36763195, 0xafbb1227, 0x6cec632a, 0xf5214098, 

diff --git a/ccan/crcsync/test/api.c b/ccan/crcsync/test/api.c
index af7ce558eabc43e1f983b81499115591bfc376f4..ed17f8e6050e78b6bdb88e7e5a15282dbe5b57db 100644 (file)
--- a/ccan/crcsync/test/api.c
+++ b/ccan/crcsync/test/api.c
@@ -1,8 +1,8 @@
 #include "crcsync/crcsync.h"
 #include "crcsync/crcsync.h"

-#include "crcsync/crcsync.c"

 #include "tap/tap.h"
 #include <stdlib.h>
 #include <stdbool.h>
 #include "tap/tap.h"
 #include <stdlib.h>
 #include <stdbool.h>

+#include <string.h>

 
 /* FIXME: ccanize. */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 /* FIXME: ccanize. */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

diff --git a/ccan/grab_file/_info.c b/ccan/grab_file/_info.c
index 9a0249f1587616cd1144756023aaba0559756312..f5d22bbce55494a959adf57b5c05d71457d9469c 100644 (file)
--- a/ccan/grab_file/_info.c
+++ b/ccan/grab_file/_info.c
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
                return 1;
 
        if (strcmp(argv[1], "depends") == 0) {
                return 1;
 
        if (strcmp(argv[1], "depends") == 0) {

+               printf("ccan/str_talloc\n"); /* Needed for tests. */

                printf("ccan/talloc\n");
                printf("ccan/noerr\n");
                return 0;
                printf("ccan/talloc\n");
                printf("ccan/noerr\n");
                return 0;

diff --git a/ccan/hash/test/api-hash_stable.c b/ccan/hash/test/api-hash_stable.c
index 5ab520c60b61a816f0542531286b99717fe95e07..37cd0736d12981b5705457b09b541a4d6db0bbbd 100644 (file)
--- a/ccan/hash/test/api-hash_stable.c
+++ b/ccan/hash/test/api-hash_stable.c
@@ -1,6 +1,5 @@
 #include "hash/hash.h"
 #include "tap/tap.h"
 #include "hash/hash.h"
 #include "tap/tap.h"

-#include "hash/hash.c"

 #include <stdbool.h>
 #include <string.h>
 
 #include <stdbool.h>
 #include <string.h>
 

diff --git a/ccan/md4/test/api.c b/ccan/md4/test/api.c
index 39810498bd91ac893336922a1bee1642439c303c..339409c04686145a7e0299db8d5b319c63595d41 100644 (file)
--- a/ccan/md4/test/api.c
+++ b/ccan/md4/test/api.c
@@ -1,7 +1,7 @@
 #include "md4/md4.h"
 #include "md4/md4.h"

-#include "md4/md4.c"

 #include <tap/tap.h>
 #include <stdio.h>
 #include <tap/tap.h>
 #include <stdio.h>

+#include <string.h>

 
 static void check_md4(const char *string, const char *expected)
 {
 
 static void check_md4(const char *string, const char *expected)
 {

diff --git a/tools/ccanlint/has_tests.c b/tools/ccanlint/has_tests.c
index 44ef64abc95cce5719a4010825ba397f50250042..320478b38da61424727c093bece2032c55c5528f 100644 (file)
--- a/tools/ccanlint/has_tests.c
+++ b/tools/ccanlint/has_tests.c
@@ -43,18 +43,26 @@ static const char *describe_has_tests(struct manifest *m, void *check_result)
        "There are four kinds of tests: api, run, compile_ok and compile_fail:\n"
        "you can tell which type of test a C file is by its name, eg 'run.c'\n"
        "and 'run-simple.c' are both run tests.\n\n"
        "There are four kinds of tests: api, run, compile_ok and compile_fail:\n"
        "you can tell which type of test a C file is by its name, eg 'run.c'\n"
        "and 'run-simple.c' are both run tests.\n\n"

+

        "The simplest kind of test is a run test, which must compile with no\n"
        "warnings, and then run: it is expected to use libtap to report its\n"
        "The simplest kind of test is a run test, which must compile with no\n"
        "warnings, and then run: it is expected to use libtap to report its\n"

-       "results in a simple and portable format.\n"
+       "results in a simple and portable format.  It should #include the C\n"
+       "files from the module directly (so it can probe the internals): the\n"
+       "module will not be linked in.\n\n"
+
+       "api tests are just like a run test, except it is a guarantee of API\n"
+       "stability: this test should pass on all future versions of the\n"
+       "module.  They *are* linked to the module, since they should only\n"
+       "test the API, not the internal state.\n\n"
+

        "compile_ok tests are a subset of run tests: they must compile and\n"
        "compile_ok tests are a subset of run tests: they must compile and\n"

-       "link, but aren't run.\n"
+       "link, but aren't run.\n\n"
+

        "compile_fail tests are tests which should fail to compile (or emit\n"
        "warnings) or link when FAIL is defined, but should compile and link\n"
        "when it's not defined: this helps ensure unrelated errors don't make\n"
        "compile_fail tests are tests which should fail to compile (or emit\n"
        "warnings) or link when FAIL is defined, but should compile and link\n"
        "when it's not defined: this helps ensure unrelated errors don't make\n"

-       "compilation fail.\n"
-       "api tests are just like a run test, except it is a guarantee of API\n"
-       "stability: this test should pass on all future versions of the\n"
-       "module.\n\n"
+       "compilation fail.\n\n"
+

        "Note that the tests are not linked against the files in the\n"
        "above: you should directly #include those C files you want.  This\n"
        "allows access to static functions and use special effects inside\n"
        "Note that the tests are not linked against the files in the\n"
        "above: you should directly #include those C files you want.  This\n"
        "allows access to static functions and use special effects inside\n"

diff --git a/tools/run_tests.c b/tools/run_tests.c
index 278b65227a3bdeddbe9631c116c5e31a8b643cd5..b4125424a60859f71bb50e7bfaf9384e54a0e1c2 100644 (file)
--- a/tools/run_tests.c
+++ b/tools/run_tests.c
@@ -19,7 +19,8 @@ static int verbose;
 struct test_type
 {
        const char *name;
 struct test_type
 {
        const char *name;

-       void (*buildfn)(const char *dir, struct test_type *t, const char *name);
+       void (*buildfn)(const char *dir, struct test_type *t, const char *name,
+                       const char *apiobj);

        void (*runfn)(const char *name);
 };
 
        void (*runfn)(const char *name);
 };
 


@@ -33,6 +34,7 @@ struct test
 struct obj
 {
        struct obj *next;
 struct obj
 {
        struct obj *next;

+       bool generate;

        char *name;
 };
 
        char *name;
 };
 


@@ -76,8 +78,11 @@ static void cleanup_objs(void)
 {
        struct obj *i;
 
 {
        struct obj *i;
 

-       for (i = objs; i; i = i->next)
+       for (i = objs; i; i = i->next) {
+               if (!i->generate)
+                       continue;

                unlink(talloc_asprintf(i, "%s.o", output_name(i->name)));
                unlink(talloc_asprintf(i, "%s.o", output_name(i->name)));

+       }

 }
 
 static void add_test(const char *testdir, const char *name, struct test_type *t)
 }
 
 static void add_test(const char *testdir, const char *name, struct test_type *t)


@@ -90,23 +95,25 @@ static void add_test(const char *testdir, const char *name, struct test_type *t)
        tests = test;
 }
 
        tests = test;
 }
 

-static void add_obj(const char *testdir, const char *name)
+static void add_obj(const char *testdir, const char *name, bool generate)

 {
        struct obj *obj = talloc(testdir, struct obj);
 
        obj->next = objs;
        obj->name = talloc_asprintf(obj, "%s/%s", testdir, name);
 {
        struct obj *obj = talloc(testdir, struct obj);
 
        obj->next = objs;
        obj->name = talloc_asprintf(obj, "%s/%s", testdir, name);

+       obj->generate = generate;

        objs = obj;
 }
 
        objs = obj;
 }
 

-static int build(const char *dir, const char *name, int fail)
+static int build(const char *dir, const char *name, const char *apiobj,
+                int fail)

 {
        const char *cmd;
        int ret;
 
 {
        const char *cmd;
        int ret;
 

-       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s -L. -lccan %s",
+       cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s %s %s",

                              fail ? "-DFAIL" : "",
                              fail ? "-DFAIL" : "",

-                             output_name(name), name, obj_list(),
+                             output_name(name), name, apiobj, obj_list(),

                              verbose ? "" : "> /dev/null 2>&1");
 
        if (verbose)
                              verbose ? "" : "> /dev/null 2>&1");
 
        if (verbose)


@@ -119,17 +126,26 @@ static int build(const char *dir, const char *name, int fail)
        return ret;
 }
 
        return ret;
 }
 

-static void compile_ok(const char *dir, struct test_type *t, const char *name)
+static void compile_ok(const char *dir, struct test_type *t, const char *name,
+                      const char *apiobj)
+{
+       ok(build(dir, name, "", 0) == 0, "%s %s", t->name, name);
+}
+
+/* api tests get the API obj linked in as well. */
+static void compile_api_ok(const char *dir, struct test_type *t,
+                          const char *name, const char *apiobj)

 {
 {

-       ok(build(dir, name, 0) == 0, "%s %s", t->name, name);
+       ok(build(dir, name, apiobj, 0) == 0, "%s %s", t->name, name);

 }
 
 }
 

-static void compile_fail(const char *dir, struct test_type *t, const char *name)
+static void compile_fail(const char *dir, struct test_type *t, const char *name,
+                        const char *apiobj)

 {
 {

-       if (build(dir, name, 0) != 0)
+       if (build(dir, name, "", 0) != 0)

                fail("non-FAIL build %s", name);
        else
                fail("non-FAIL build %s", name);
        else

-               ok(build(dir, name, 1) > 0, "%s %s", t->name, name);
+               ok(build(dir, name, "", 1) > 0, "%s %s", t->name, name);

 }
 
 static void no_run(const char *name)
 }
 
 static void no_run(const char *name)


@@ -151,16 +167,17 @@ static struct test_type test_types[] = {
        { "compile_ok", compile_ok, no_run },
        { "compile_fail", compile_fail, no_run },
        { "run", compile_ok, run },
        { "compile_ok", compile_ok, no_run },
        { "compile_fail", compile_fail, no_run },
        { "run", compile_ok, run },

-       { "api", compile_ok, run },
+       { "api", compile_api_ok, run },

 };
 
 int main(int argc, char *argv[])
 {
        DIR *dir;
        struct dirent *d;
 };
 
 int main(int argc, char *argv[])
 {
        DIR *dir;
        struct dirent *d;

-       char *testdir;
+       char *testdir, *cwd;
+       const char *apiobj = "";

        struct test *test;
        struct test *test;

-       unsigned int num_tests = 0, num_objs = 0;
+       unsigned int num_tests = 0, num_objs = 0, i;

 
        if (argc > 1 && streq(argv[1], "--verbose")) {
                verbose = 1;
 
        if (argc > 1 && streq(argv[1], "--verbose")) {
                verbose = 1;


@@ -168,8 +185,14 @@ int main(int argc, char *argv[])
                argv++;
        }
 
                argv++;
        }
 

-       if (argc != 2)
-               errx(1, "Usage: run_tests [--verbose] <dir>");
+       if (argc > 1 && strstarts(argv[1], "--apiobj=")) {
+               apiobj = argv[1] + strlen("--apiobj=");
+               argc--;
+               argv++;
+       }
+
+       if (argc < 2)
+               errx(1, "Usage: run_tests [--verbose] [--apiobj=<obj>] <dir> [<extra-objs>...]");

 
        testdir = talloc_asprintf(NULL, "%s/test", argv[1]);
        dir = opendir(testdir);
 
        testdir = talloc_asprintf(NULL, "%s/test", argv[1]);
        dir = opendir(testdir);


@@ -177,7 +200,6 @@ int main(int argc, char *argv[])
                err(1, "Opening '%s'", testdir);
 
        while ((d = readdir(dir)) != NULL) {
                err(1, "Opening '%s'", testdir);
 
        while ((d = readdir(dir)) != NULL) {

-               unsigned int i;

                if (d->d_name[0] == '.' || !strends(d->d_name, ".c"))
                        continue;
 
                if (d->d_name[0] == '.' || !strends(d->d_name, ".c"))
                        continue;
 


@@ -189,7 +211,7 @@ int main(int argc, char *argv[])
                        }
                }
                if (i == ARRAY_SIZE(test_types)) {
                        }
                }
                if (i == ARRAY_SIZE(test_types)) {

-                       add_obj(testdir, d->d_name);
+                       add_obj(testdir, d->d_name, true);

                        num_objs++;
                }
        }
                        num_objs++;
                }
        }


@@ -198,9 +220,14 @@ int main(int argc, char *argv[])
        /* First all the extra object compilations. */
        compile_objs();
 
        /* First all the extra object compilations. */
        compile_objs();
 

+       /* Now add any object files from the command line */
+       cwd = talloc_strdup(testdir, ".");
+       for (i = 2; i < argc; i++)
+               add_obj(cwd, argv[i], false);
+

        /* Do all the test compilations. */
        for (test = tests; test; test = test->next)
        /* Do all the test compilations. */
        for (test = tests; test; test = test->next)

-               test->type->buildfn(argv[1], test->type, test->name);
+               test->type->buildfn(argv[1], test->type, test->name, apiobj);

 
        cleanup_objs();
 
 
        cleanup_objs();