From 608148436caa82ffe78d758253c6b7eb5232cb70 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 3 Feb 2016 13:19:57 +1030 Subject: [PATCH 1/1] tools: commit missing support for _info ported flag. Signed-off-by: Rusty Russell --- doc/ccanlint.1.txt | 4 ++++ tools/depends.c | 44 +++++++++++++++++++++++++++++++++++++++++++- tools/tools.h | 3 +++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/doc/ccanlint.1.txt b/doc/ccanlint.1.txt index 26d46f4c..b2f1537a 100644 --- a/doc/ccanlint.1.txt +++ b/doc/ccanlint.1.txt @@ -87,6 +87,10 @@ test, but happy: CCAN module must have '_info' file describing. No this score is 0. However, *ccanlint* question may help to write one. +*info_ported*:: + CCAN module '_info' can say 'ported' arg; if says '0' not ported, few tests + run. + *depends_exist*:: '_info' file CCAN other module without saying, must find. It is not score 0. diff --git a/tools/depends.c b/tools/depends.c index 871a3e87..53fed44b 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -227,7 +227,7 @@ get_all_deps(const void *ctx, const char *dir, const char *style, return deps; } -/* Can return NULL: _info may not support 'libs'. */ +/* Can return NULL: _info may not support prop. */ static char **get_one_prop(const void *ctx, const char *dir, const char *prop, char *(*get_info)(const void *ctx, const char *dir)) { @@ -282,6 +282,48 @@ char **get_cflags(const void *ctx, const char *dir, return flags; } +static bool get_one_ported(const void *ctx, const char *dir, + char *(*get_info)(const void *ctx, const char *dir)) +{ + char **ported = get_one_prop(ctx, dir, "ported", get_info); + + /* No news is good news. */ + if (!ported || tal_count(ported) == 0) + return true; + + if (tal_count(ported) != 1) + errx(1, "%s/_info ported gave %zu lines, not one", + dir, tal_count(ported)); + + if (streq(ported[0], "1")) + return true; + else if (streq(ported[0], "0")) + return false; + errx(1, "%s/_info ported gave invalid output '%s'", dir, ported[0]); +} + +bool get_ported(const void *ctx, const char *dir, bool recurse, + char *(*get_info)(const void *ctx, const char *dir)) +{ + if (!get_one_ported(ctx, dir, get_info)) + return false; + + if (recurse) { + size_t i; + char **deps = get_deps(ctx, dir, "depends", true, get_info); + for (i = 0; deps[i]; i++) { + char *subdir; + if (!strstarts(deps[i], "ccan/")) + continue; + + subdir = path_join(ctx, find_ccan_dir(dir), deps[i]); + if (!get_one_ported(ctx, subdir, get_info)) + return false; + } + } + return true; +} + char **get_libs(const void *ctx, const char *dir, const char *style, char *(*get_info)(const void *ctx, const char *dir)) { diff --git a/tools/tools.h b/tools/tools.h index cfbe871f..7e2598c3 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -46,6 +46,9 @@ char **get_libs(const void *ctx, const char *dir, const char *style, char **get_cflags(const void *ctx, const char *dir, char *(*get_info)(const void *ctx, const char *dir)); +bool get_ported(const void *ctx, const char *dir, bool recurse, + char *(*get_info)(const void *ctx, const char *dir)); + /* From tools.c */ /* If set, print all commands run, all output they give and exit status. */ extern bool tools_verbose; -- 2.39.2