tools: enhance get_libs to get libraries for tests, too.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 79817c78e1af03286d2181de3d71d7a3b087c597..ac9476fd01bcb34843525fda34c781b0045aa89a 100644 (file)
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -120,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++) {
 
        /* 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]);
        }
                for (j = 0; libs[j]; j++)
                        list = talloc_asprintf_append(list, "-l%s ", libs[j]);
        }

diff --git a/tools/ccanlint/tests/module_links.c b/tools/ccanlint/tests/module_links.c
index 79aa7d1a872a6421c6fb8706142fe2df0c2b9e76..d665ba7d6672f7a86849f6683686e6bb83fa42a3 100644 (file)
--- a/tools/ccanlint/tests/module_links.c
+++ b/tools/ccanlint/tests/module_links.c
@@ -47,7 +47,7 @@ static char *lib_list(const struct manifest *m)
        char **libs;
        char *ret = talloc_strdup(m, "");
 
        char **libs;
        char *ret = talloc_strdup(m, "");
 

-       libs = get_libs(m, m->dir, true, get_or_compile_info);
+       libs = get_libs(m, m->dir, "depends", get_or_compile_info);

        for (i = 0; libs[i]; i++)
                ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
        return ret;
        for (i = 0; libs[i]; i++)
                ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
        return ret;

diff --git a/tools/ccanlint/tests/tests_compile.c b/tools/ccanlint/tests/tests_compile.c
index 733aebdb88d1b7d0a977f1285523ecb878fb32ea..3114f2f1bc6de31ea7b7afdf4a382a36cfdde72e 100644 (file)
--- a/tools/ccanlint/tests/tests_compile.c
+++ b/tools/ccanlint/tests/tests_compile.c
@@ -58,7 +58,7 @@ char *lib_list(const struct manifest *m, enum compile_type ctype)
        char **libs;
        char *ret = talloc_strdup(m, "");
 
        char **libs;
        char *ret = talloc_strdup(m, "");
 

-       libs = get_libs(m, m->dir, true, get_or_compile_info);
+       libs = get_libs(m, m->dir, "depends", get_or_compile_info);

        for (i = 0; libs[i]; i++)
                ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
        return ret;
        for (i = 0; libs[i]; i++)
                ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
        return ret;

diff --git a/tools/depends.c b/tools/depends.c
index c6c775448454c7513c8efd54c0a0633293629a85..441c2c47b79408bca0b4d290ad78d94ec124e0f0 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -244,7 +244,24 @@ static char **get_one_libs(const void *ctx, const char *dir,
        return lines;
 }
 
        return lines;
 }
 

-char **get_libs(const void *ctx, const char *dir, bool recurse,
+/* O(n^2) but n is small. */
+static char **add_deps(char **deps1, char **deps2)
+{
+       unsigned int i, len;
+
+       len = talloc_array_length(deps1);
+
+       for (i = 0; deps2[i]; i++) {
+               if (have_dep(deps1, deps2[i]))
+                       continue;
+               deps1 = talloc_realloc(NULL, deps1, char *, len + 1);
+               deps1[len-1] = talloc_steal(deps1, deps2[i]);
+               deps1[len++] = NULL;
+       }
+       return deps1;
+}
+
+char **get_libs(const void *ctx, const char *dir, const char *style,

                char *(*get_info)(const void *ctx, const char *dir))
 {
        char **deps, **libs;
                char *(*get_info)(const void *ctx, const char *dir))
 {
        char **deps, **libs;


@@ -253,8 +270,13 @@ char **get_libs(const void *ctx, const char *dir, bool recurse,
        libs = get_one_libs(ctx, dir, get_info);
        len = talloc_array_length(libs);
 
        libs = get_one_libs(ctx, dir, get_info);
        len = talloc_array_length(libs);
 

-       if (recurse) {
-               deps = get_deps(ctx, dir, "depends", true, get_info);
+       if (style) {
+               deps = get_deps(ctx, dir, style, true, get_info);
+               if (streq(style, "testdepends"))
+                       deps = add_deps(deps,
+                                       get_deps(ctx, dir, "depends", true,
+                                                get_info));
+

                for (i = 0; deps[i]; i++) {
                        char **newlibs, *subdir;
                        size_t newlen;
                for (i = 0; deps[i]; i++) {
                        char **newlibs, *subdir;
                        size_t newlen;

diff --git a/tools/tools.h b/tools/tools.h
index 7368e93208688291e8ea1eaa1ee9e1a2574a1bb6..1e9e22424906284458ea14f789c05ff3859916db 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -31,8 +31,12 @@ char **get_deps(const void *ctx, const char *dir, const char *style,
 char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
                          bool recurse);
 
 char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
                          bool recurse);
 

-/* This also needs to compile the info file. */
-char **get_libs(const void *ctx, const char *dir, bool recurse,
+/* This also needs to compile the info file:
+ * style == NULL: don't recurse.
+ * style == depends: recurse dependencies.
+ * style == testdepends: recurse testdepends and depends.
+ */
+char **get_libs(const void *ctx, const char *dir, const char *style,

                char *(*get_info)(const void *ctx, const char *dir));
 
 /* From tools.c */
                char *(*get_info)(const void *ctx, const char *dir));
 
 /* From tools.c */