X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=8ab806438f1b4aab25e033cda63fca6915017e0c;hp=ae0d16d62a8cedd81a5542f88c55dd2c98d71e6c;hb=100444225380d3f5ca29424ea54703d308c7c651;hpb=9cca4b73c96adeb39ab89027eca9ea5323a3a598 diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index ae0d16d6..8ab80643 100644 --- a/tools/ccanlint/tests/examples_compile.c +++ b/tools/ccanlint/tests/examples_compile.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include "../compulsory_tests/build.h" static const char *can_run(struct manifest *m) { @@ -20,85 +22,83 @@ static const char *can_run(struct manifest *m) return NULL; } -/* FIXME: We should build if it doesn't exist... */ -static bool expect_obj_file(const char *dir) +static void add_mod(struct manifest ***deps, struct manifest *m) { - struct manifest *dep_man; - bool has_c_files; - - dep_man = get_manifest(dir, dir); - - /* If it has C files, we expect an object file built from them. */ - has_c_files = !list_empty(&dep_man->c_files); - talloc_free(dep_man); - return has_c_files; + unsigned int num = talloc_get_size(*deps) / sizeof(*deps); + *deps = talloc_realloc(NULL, *deps, struct manifest *, num + 1); + (*deps)[num] = m; } -static char *add_dep(const struct manifest *m, char *list, const char *mod) +static bool have_mod(struct manifest *deps[], const char *basename) { - char **deps, *obj; unsigned int i; - /* Not ourselves. */ - if (streq(m->basename, mod)) - return list; + for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++) + if (strcmp(deps[i]->basename, basename) == 0) + return true; + return false; +} - /* Not if there's no object file for that module */ - if (!expect_obj_file(talloc_asprintf(list, "%s/ccan/%s", ccan_dir,mod))) - return list; +static void add_dep(struct manifest ***deps, const char *basename) +{ + unsigned int i; + struct manifest *m; + char *errstr; - obj = talloc_asprintf(list, "%s/ccan/%s.o", ccan_dir, mod); + if (have_mod(*deps, basename)) + return; - /* Not anyone we've already included. */ - if (strstr(list, obj)) - return list; + m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s", + ccan_dir, basename)); + errstr = build_submodule(m); + if (errstr) + errx(1, "%s", errstr); - list = talloc_asprintf_append(list, " %s", obj); + add_mod(deps, m); /* Get that modules depends as well... */ assert(!safe_mode); - deps = get_deps(m, talloc_asprintf(list, "%s/ccan/%s", ccan_dir, mod), - false, NULL); + if (m->info_file) { + char **infodeps; + + infodeps = get_deps(m, m->dir, false, &m->info_file->compiled); - for (i = 0; deps[i]; i++) { - if (strstarts(deps[i], "ccan/")) - list = add_dep(m, list, deps[i] + strlen("ccan/")); + for (i = 0; infodeps[i]; i++) { + if (strstarts(infodeps[i], "ccan/")) + add_dep(deps, infodeps[i] + strlen("ccan/")); + } } - return list; } -/* FIXME: Merge this into one place. */ -static char *obj_list(const struct manifest *m, struct ccan_file *f) +static char *obj_list(struct manifest *m, struct ccan_file *f) { - char *list = talloc_strdup(m, ""); - struct manifest *subm; - char **lines; - - /* This module. */ - if (m->compiled) - list = talloc_asprintf_append(list, " %s", m->compiled); + struct manifest **deps = talloc_array(f, struct manifest *, 0); + char **lines, *list; + unsigned int i; - /* Other ccan modules we depend on. */ - list_for_each(&m->deps, subm, list) { - if (subm->compiled) - list = talloc_asprintf_append(list, " %s", - subm->compiled); - } + /* This one for a start. */ + add_dep(&deps, m->basename); /* Other modules implied by includes. */ for (lines = get_ccan_file_lines(f); *lines; lines++) { unsigned preflen = strspn(*lines, " \t"); if (strstarts(*lines + preflen, "#include compiled) + list = talloc_asprintf_append(list, " %s", + deps[i]->compiled); + } return list; } @@ -122,6 +122,9 @@ static bool compile(const void *ctx, if (!compile_and_link(ctx, file->fullname, ccan_dir, obj_list(m, file), "", lib_list(m), file->compiled, output)) { + /* Don't keep failures. */ + if (keep) + unlink(file->compiled); talloc_free(file->compiled); file->compiled = NULL; return false; @@ -291,6 +294,19 @@ static char **combine(const void *ctx, char **lines, char **prev) return ret; } +/* Only handles very simple comments. */ +static char *strip_comment(const void *ctx, const char *orig_line) +{ + char *p, *ret = talloc_strdup(ctx, orig_line); + + p = strstr(ret, "/*"); + if (!p) + p = strstr(ret, "//"); + if (p) + *p = '\0'; + return ret; +} + static char *mangle(struct manifest *m, char **lines) { char *ret, *use_funcs = NULL, *why; @@ -334,28 +350,30 @@ static char *mangle(struct manifest *m, char **lines) /* Primitive, very primitive. */ for (i = 0; lines[i]; i++) { + char *line = strip_comment(ret, lines[i]); + /* } at start of line ends a function. */ if (in_function) { - if (lines[i][0] == '}') + if (line[0] == '}') in_function = false; } else { /* Character at start of line, with ( and no ; * == function start. Ignore comments. */ - if (!isspace(lines[i][0]) - && strchr(lines[i], '(') - && !strchr(lines[i], ';') - && !strstr(lines[i], "//")) { + if (!isspace(line[0]) + && strchr(line, '(') + && !strchr(line, ';') + && !strstr(line, "//")) { in_function = true; - if (strncmp(lines[i], "int main", 8) == 0) + if (strncmp(line, "int main", 8) == 0) has_main = true; - if (strncmp(lines[i], "static", 6) == 0) { + if (strncmp(line, "static", 6) == 0) { use_funcs = add_func(use_funcs, - lines[i]); + line); } } } /* ... means elided code. */ - if (strcmp(lines[i], "...") == 0) { + if (strcmp(line, "...") == 0) { if (!in_function && !has_main && looks_internal(lines + i + 1, &why)) { /* This implies we start a function here. */ @@ -527,18 +545,23 @@ static void build_examples(struct manifest *m, bool keep, prev = lines[j]; score->score++; warnings = true; - score->error = "Compiling extracted example" - " gave warnings"; - score_file_error(score, file[j], 0, err[j]); + score_file_error(score, file[j], 0, + "Compiling extracted example" + " gave warnings:\n" + "Example:\n" + "%s\n" + "Compiler:\n" + "%s", + get_ccan_file_contents(file[j]), + err[j]); goto next; } } score->pass = false; - score->error = "Compiling extracted examples failed"; if (!verbose) { if (num == 3) - error = "Standalone, adding headers, " + error = "Compiling standalone, adding headers, " "and including previous " "example all failed"; else @@ -593,10 +616,11 @@ static void build_examples(struct manifest *m, bool keep, } struct ccanlint examples_compile = { - .key = "examples-compile", + .key = "examples_compile", .name = "Module examples compile", .check = build_examples, .can_run = can_run, + .needs = "examples_exist module_builds" }; -REGISTER_TEST(examples_compile, &has_examples, &build, NULL); +REGISTER_TEST(examples_compile);