X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=4b6f4d624be2ead86e1a66a09d8f678bad8cb627;hp=ff9e529b645a8d46b39f4c4a2e2c976221402905;hb=caf366998b97b7cc29bc1f33c285feb2f5d33bff;hpb=f9423c171395571f9880286190d9cf63da147668 diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index ff9e529b..4b6f4d62 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 @@ -121,7 +122,11 @@ 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)) { + 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; @@ -141,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; } @@ -184,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; } @@ -235,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; } @@ -310,23 +319,24 @@ static char *mangle(struct manifest *m, char **lines) 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" @@ -356,7 +366,7 @@ static char *mangle(struct manifest *m, char **lines) } else { /* Character at start of line, with ( and no ; * == function start. Ignore comments. */ - if (!isspace(line[0]) + if (!cisspace(line[0]) && strchr(line, '(') && !strchr(line, ';') && !strstr(line, "//")) { @@ -516,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++; @@ -542,25 +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"; - error = talloc_asprintf(score, - "Example:\n" - "%s\n" - "Compiler:\n" - "%s", - get_ccan_file_contents(file[j]), - err[j]); - score_file_error(score, file[j], 0, error); + 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 @@ -598,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; @@ -619,6 +627,7 @@ struct ccanlint 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);