X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=ac9476fd01bcb34843525fda34c781b0045aa89a;hb=453fdc02ce54ff965f9971a3bfd0e1a79b6c98f9;hp=0da9d757b680a39052d5bedd078b09a32a9ac344;hpb=bbb4aa72f0a087b3a1441e912ccac576c907e618;p=ccan diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c index 0da9d757..ac9476fd 100644 --- a/tools/ccanlint/tests/examples_compile.c +++ b/tools/ccanlint/tests/examples_compile.c @@ -62,7 +62,8 @@ static void add_dep(struct manifest ***deps, const char *basename) if (m->info_file) { char **infodeps; - infodeps = get_deps(m, m->dir, false, get_or_compile_info); + infodeps = get_deps(m, m->dir, "depends", false, + get_or_compile_info); for (i = 0; infodeps[i]; i++) { if (strstarts(infodeps[i], "ccan/")) @@ -119,7 +120,7 @@ static char *example_lib_list(const void *ctx, struct manifest **deps) /* FIXME: This doesn't uniquify. */ for (i = 0; i < talloc_array_length(deps); i++) { - libs = get_libs(ctx, deps[i]->dir, false, get_or_compile_info); + libs = get_libs(ctx, deps[i]->dir, NULL, get_or_compile_info); for (j = 0; libs[j]; j++) list = talloc_asprintf_append(list, "-l%s ", libs[j]); } @@ -204,7 +205,8 @@ 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] || cisspace(line[0]) || strstarts(line, "//")) + if (!line[0] || cisspace(line[0]) || strstarts(line, "//") + || strstarts(line, "#line")) continue; assert(line[strlen(line)-1] != '\n');