tools: don't assume modules are immediately below ccan/ dir.

[ccan] / tools / ccanlint / tests / examples_compile.c

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 0da9d757b680a39052d5bedd078b09a32a9ac344..ce1d9769691d7ee6fa07736e33718f8deb2c55e5 100644 (file)
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -30,27 +30,27 @@ static void add_mod(struct manifest ***deps, struct manifest *m)
        (*deps)[num] = m;
 }
 
-static bool have_mod(struct manifest *deps[], const char *basename)
+static bool have_mod(struct manifest *deps[], const char *modname)
 {
        unsigned int i;
 
        for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++)
-               if (strcmp(deps[i]->basename, basename) == 0)
+               if (strcmp(deps[i]->modname, modname) == 0)
                        return true;
        return false;
 }
 
-static void add_dep(struct manifest ***deps, const char *basename)
+static void add_dep(struct manifest ***deps, const char *modname)
 {
        unsigned int i;
        struct manifest *m;
        char *errstr;
 
-       if (have_mod(*deps, basename))
+       if (have_mod(*deps, modname))
                return;
 
        m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
-                                               ccan_dir, basename));
+                                               ccan_dir, modname));
        errstr = build_submodule(m, cflags, COMPILE_NORMAL);
        if (errstr)
                errx(1, "%s", errstr);
@@ -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/"))
@@ -78,7 +79,7 @@ static struct manifest **get_example_deps(struct manifest *m,
        struct manifest **deps = talloc_array(f, struct manifest *, 0);
 
        /* This one for a start. */
-       add_dep(&deps, m->basename);
+       add_dep(&deps, m->modname);
 
        /* Other modules implied by includes. */
        for (lines = get_ccan_file_lines(f); *lines; lines++) {
@@ -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');
@@ -360,7 +362,7 @@ static char *mangle(struct manifest *m, char **lines)
                              "#include <sys/stat.h>\n"
                              "#include <sys/types.h>\n"
                              "#include <unistd.h>\n",
-                             m->basename, m->basename);
+                             m->modname, m->basename);
 
        ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
                                     "extern int somefunc(void);\n"