X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=646e5ae3325a575f94e83ab496fcef66792016a6;hp=87a6ad02e7376bb779dc661ee891b453a305b18f;hb=271676fecdb2fb079374b9e3fe03e5c53e7f0f23;hpb=9d511cc5b12021b6c6c079fc5b08487fdf361a26 diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index 87a6ad02..646e5ae3 100644 --- a/tools/ccanlint/tests/examples_compile.c +++ b/tools/ccanlint/tests/examples_compile.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -10,6 +11,8 @@ #include #include #include +#include +#include "../compulsory_tests/build.h" static const char *can_run(struct manifest *m) { @@ -20,86 +23,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 *example_obj_list(struct manifest *m, struct ccan_file *f) { - char *list = talloc_strdup(m, ""); - struct ccan_file *i; - struct manifest *subm; - char **lines; - - /* Object files for this module. */ - list_for_each(&m->c_files, i, list) - list = talloc_asprintf_append(list, " %s", i->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; } @@ -121,8 +121,12 @@ static bool compile(const void *ctx, { file->compiled = maybe_temp_file(ctx, "", keep, file->fullname); if (!compile_and_link(ctx, file->fullname, ccan_dir, - obj_list(m, file), - "", lib_list(m), file->compiled, output)) { + example_obj_list(m, file), + compiler, cflags, + lib_list(m), file->compiled, output)) { + /* Don't keep failures. */ + if (keep) + unlink(file->compiled); talloc_free(file->compiled); file->compiled = NULL; return false; @@ -142,13 +146,13 @@ static char *start_main(char *ret, const char *why) static char *add_func(char *others, const char *line) { const char *p, *end = strchr(line, '(') - 1; - while (isspace(*end)) { + while (cisspace(*end)) { end--; if (end == line) return others; } - for (p = end; isalnum(*p) || *p == '_'; p--) { + for (p = end; cisalnum(*p) || *p == '_'; p--) { if (p == line) return others; } @@ -185,48 +189,52 @@ static bool looks_internal(char **lines, char **why) const char *line = lines[i] + strspn(lines[i], " \t"); unsigned len = strspn(line, IDENT_CHARS); - if (!line[0] || isspace(line[0]) || strstarts(line, "//")) + if (!line[0] || cisspace(line[0]) || strstarts(line, "//")) continue; /* The winners. */ if (strstarts(line, "if") && len == 2) { - *why = "starts with if"; + *why = cast_const(char *, "starts with if"); return true; } if (strstarts(line, "for") && len == 3) { - *why = "starts with for"; + *why = cast_const(char *, "starts with for"); return true; } if (strstarts(line, "while") && len == 5) { - *why = "starts with while"; + *why = cast_const(char *, "starts with while"); return true; } if (strstarts(line, "do") && len == 2) { - *why = "starts with do"; + *why = cast_const(char *, "starts with do"); return true; } /* The losers. */ if (strstarts(line, "#include")) { - *why = "starts with #include"; + *why = cast_const(char *, "starts with #include"); return false; } if (last_ended && strchr(line, '(')) { if (strstarts(line, "static")) { - *why = "starts with static and contains ("; + *why = cast_const(char *, + "starts with static" + " and contains ("); return false; } if (strends(line, ")")) { - *why = "contains ( and ends with )"; + *why = cast_const(char *, + "contains ( and ends with )"); return false; } } /* Single identifier then operator == inside function. */ if (last_ended && len - && ispunct(line[len+strspn(line+len, " ")])) { - *why = "starts with identifier then punctuation"; + && cispunct(line[len+strspn(line+len, " ")])) { + *why = cast_const(char *, "starts with identifier" + " then punctuation"); return true; } @@ -236,7 +244,7 @@ static bool looks_internal(char **lines, char **why) } /* No idea... Say yes? */ - *why = "gave no clues"; + *why = cast_const(char *, "gave no clues"); return true; } @@ -292,29 +300,43 @@ 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; bool in_function = false, fake_function = false, has_main = false; unsigned int i; - ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "#include \n"); - ret = talloc_asprintf_append(ret, "/* Include header from module. */\n" - "#include \n", - m->basename, m->basename); + ret = talloc_asprintf(m, + "/* Include header from module. */\n" + "#include \n" + "/* Prepend a heap of headers. */\n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n" + "#include \n", + m->basename, m->basename); ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n" "extern int somefunc(void);\n" @@ -335,28 +357,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 (!cisspace(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. */ @@ -502,7 +526,7 @@ static void build_examples(struct manifest *m, bool keep, bool res[3]; unsigned num, j; char **lines[3]; - char *error; + const char *error; score->total++; @@ -528,18 +552,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 @@ -577,7 +606,7 @@ static void build_examples(struct manifest *m, bool keep, err[1]); } } - score_file_error(score, i, 0, error); + score_file_error(score, i, 0, "%s", error); /* This didn't work, so not a candidate for combining. */ prev = NULL; @@ -594,10 +623,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_objs, NULL); +REGISTER_TEST(examples_compile);