From 8f61c0bccb152b2365baf70deac1e59264d7feb7 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 28 May 2009 13:44:35 +0930 Subject: [PATCH] Move ccanlint tests into subdirectories. --- tools/ccanlint/Makefile | 33 +++++++------------ .../{ => compulsory_tests}/has_info.c | 2 +- .../{ => compulsory_tests}/has_main_header.c | 2 +- .../{ => compulsory_tests}/has_tests.c | 2 +- .../{ => tests}/has_info_documentation.c | 4 +-- tools/ccanlint/{ => tests}/idempotent.c | 4 +-- .../{ => tests}/trailing_whitespace.c | 2 +- 7 files changed, 19 insertions(+), 30 deletions(-) rename tools/ccanlint/{ => compulsory_tests}/has_info.c (97%) rename tools/ccanlint/{ => compulsory_tests}/has_main_header.c (96%) rename tools/ccanlint/{ => compulsory_tests}/has_tests.c (99%) rename tools/ccanlint/{ => tests}/has_info_documentation.c (98%) rename tools/ccanlint/{ => tests}/idempotent.c (98%) rename tools/ccanlint/{ => tests}/trailing_whitespace.c (97%) diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile index 87ff2d0e..cd507e5d 100644 --- a/tools/ccanlint/Makefile +++ b/tools/ccanlint/Makefile @@ -1,32 +1,21 @@ -OBJS := tools/ccanlint/has_info.o \ - tools/ccanlint/has_main_header.o \ - tools/ccanlint/has_tests.o \ - tools/ccanlint/trailing_whitespace.o \ - tools/ccanlint/idempotent.o \ - tools/ccanlint/has_info_documentation.o \ +TEST_CFILES := $(wildcard tools/ccanlint/compulsory_tests/*.c) \ + $(wildcard tools/ccanlint/tests/*.c) +TEST_OBJS := $(TEST_CFILES:.c=.o) -FUTURE:=tools/ccanlint/if_have_not_ifdef.o \ - tools/ccanlint/needs_depends.o \ - tools/ccanlint/has_info_documentation.o \ - tools/ccanlint/has_header_documentation.o \ - tools/ccanlint/has_tests.o \ - tools/ccanlint/builds_ok.o \ - tools/ccanlint/builds_ok_all_have_variants.o \ - tools/ccanlint/run_tests.o \ - tools/ccanlint/test_coverage.o \ +CORE_OBJS := tools/ccanlint/ccanlint.o \ + tools/ccanlint/file_analysis.o \ + tools/doc_extract-core.o \ + ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o \ + ccan/talloc/talloc.o ccan/noerr/noerr.o + +OBJS := $(CORE_OBJS) $(TEST_OBJS) tools/ccanlint/generated-init-tests: $(OBJS) cat $(OBJS:.o=.c) | sed -n 's/^struct ccanlint \([A-Za-z0-9_]*\) = {/{ extern struct ccanlint \1; list_add(\&tests, \&\1.list); }/p' >$@ tools/ccanlint/ccanlint.o: tools/ccanlint/generated-init-tests -tools/ccanlint/ccanlint: \ - $(OBJS) \ - tools/ccanlint/ccanlint.o \ - tools/ccanlint/file_analysis.o \ - tools/doc_extract-core.o \ - ccan/str_talloc/str_talloc.o ccan/grab_file/grab_file.o \ - ccan/talloc/talloc.o ccan/noerr/noerr.o +tools/ccanlint/ccanlint: $(OBJS) ccanlint-clean: $(RM) tools/ccanlint/generated-init-tests diff --git a/tools/ccanlint/has_info.c b/tools/ccanlint/compulsory_tests/has_info.c similarity index 97% rename from tools/ccanlint/has_info.c rename to tools/ccanlint/compulsory_tests/has_info.c index 563eb2f6..e7f2622d 100644 --- a/tools/ccanlint/has_info.c +++ b/tools/ccanlint/compulsory_tests/has_info.c @@ -1,4 +1,4 @@ -#include "ccanlint.h" +#include #include #include #include diff --git a/tools/ccanlint/has_main_header.c b/tools/ccanlint/compulsory_tests/has_main_header.c similarity index 96% rename from tools/ccanlint/has_main_header.c rename to tools/ccanlint/compulsory_tests/has_main_header.c index e1b71198..978bfcb6 100644 --- a/tools/ccanlint/has_main_header.c +++ b/tools/ccanlint/compulsory_tests/has_main_header.c @@ -1,4 +1,4 @@ -#include "ccanlint.h" +#include #include #include #include diff --git a/tools/ccanlint/has_tests.c b/tools/ccanlint/compulsory_tests/has_tests.c similarity index 99% rename from tools/ccanlint/has_tests.c rename to tools/ccanlint/compulsory_tests/has_tests.c index efea3c06..a71a1569 100644 --- a/tools/ccanlint/has_tests.c +++ b/tools/ccanlint/compulsory_tests/has_tests.c @@ -1,4 +1,4 @@ -#include "ccanlint.h" +#include #include #include #include diff --git a/tools/ccanlint/has_info_documentation.c b/tools/ccanlint/tests/has_info_documentation.c similarity index 98% rename from tools/ccanlint/has_info_documentation.c rename to tools/ccanlint/tests/has_info_documentation.c index 3142b7b0..4202880e 100644 --- a/tools/ccanlint/has_info_documentation.c +++ b/tools/ccanlint/tests/has_info_documentation.c @@ -1,5 +1,5 @@ -#include "ccanlint.h" -#include "../doc_extract.h" +#include +#include #include #include #include diff --git a/tools/ccanlint/idempotent.c b/tools/ccanlint/tests/idempotent.c similarity index 98% rename from tools/ccanlint/idempotent.c rename to tools/ccanlint/tests/idempotent.c index fa65b05f..0aa7d8b3 100644 --- a/tools/ccanlint/idempotent.c +++ b/tools/ccanlint/tests/idempotent.c @@ -1,4 +1,5 @@ -#include "ccanlint.h" +#include +#include #include #include #include @@ -12,7 +13,6 @@ #include #include #include -#include "../tools.h" static const char explain[] = "Headers usually start with the C preprocessor lines to prevent multiple\n" diff --git a/tools/ccanlint/trailing_whitespace.c b/tools/ccanlint/tests/trailing_whitespace.c similarity index 97% rename from tools/ccanlint/trailing_whitespace.c rename to tools/ccanlint/tests/trailing_whitespace.c index 96ab0d9d..f522d316 100644 --- a/tools/ccanlint/trailing_whitespace.c +++ b/tools/ccanlint/tests/trailing_whitespace.c @@ -1,5 +1,5 @@ /* Trailing whitespace test. Almost embarrassing, but trivial. */ -#include "ccanlint.h" +#include #include #include -- 2.39.2