ccanlint: Add cflags support to _info

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

diff --git a/tools/ccanlint/tests/tests_compile_coverage.c b/tools/ccanlint/tests/tests_compile_coverage.c
index accb9ffdc04af8ed1a5280031032a8e27c47167e..89308fe80ae9ae4a26ba97979bb11f7bf2725785 100644 (file)
--- a/tools/ccanlint/tests/tests_compile_coverage.c
+++ b/tools/ccanlint/tests/tests_compile_coverage.c
@@ -1,6 +1,5 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
@@ -20,37 +19,60 @@
 /* Note: we already test safe_mode in run_tests.c */
 static const char *can_run_coverage(struct manifest *m)
 {
+#ifdef __GNUC__
        unsigned int timeleft = default_timeout_ms;
        char *output;
 
        if (!run_command(m, &timeleft, &output, "gcov -h"))
-               return talloc_asprintf(m, "No gcov support: %s", output);
+               return tal_fmt(m, "No gcov support: %s", output);
        return NULL;
+#else
+       return "No coverage support for this compiler";
+#endif
+}
+
+static char *cflags_list(const struct manifest *m)
+{
+       unsigned int i;
+       char *ret = tal_strdup(m, cflags);
+
+       char **flags = get_cflags(m, m->dir, get_or_compile_info);
+       for (i = 0; flags[i]; i++)
+               tal_append_fmt(&ret, " %s", flags[i]);
+       return ret;
+}
+
+static char *cflags_list_append(const struct manifest *m, char *iflags)
+{
+       unsigned int i;
+
+       char **flags = get_cflags(m, m->dir, get_or_compile_info);
+       for (i = 0; flags[i]; i++)
+               tal_append_fmt(&iflags, " %s", flags[i]);
+       return iflags;
 }
 
 static void cov_compile(const void *ctx,
                        unsigned int time_ms,
                        struct manifest *m,
                        struct ccan_file *file,
-                       bool link_with_module,
-                       bool keep)
+                       bool link_with_module)
 {
-       char *flags = talloc_asprintf(ctx, "%s %s", cflags, COVERAGE_CFLAGS);
+       char *flags = tal_fmt(ctx, "%s %s", cflags, COVERAGE_CFLAGS);
+       flags = cflags_list_append(m, flags);
 
-       file->compiled[COMPILE_COVERAGE]
-               = maybe_temp_file(ctx, "", keep, file->fullname);
+       file->compiled[COMPILE_COVERAGE] = temp_file(ctx, "", file->fullname);
        compile_and_link_async(file, time_ms, file->fullname, ccan_dir,
                               test_obj_list(m, link_with_module,
                                             COMPILE_NORMAL,
                                             COMPILE_COVERAGE),
                               compiler, flags,
-                              lib_list(m, COMPILE_NORMAL),
+                              test_lib_list(m, COMPILE_NORMAL),
                               file->compiled[COMPILE_COVERAGE]);
 }
 
 /* FIXME: Coverage from testable examples as well. */
 static void do_compile_coverage_tests(struct manifest *m,
-                                     bool keep,
                                      unsigned int *timeleft,
                                      struct score *score)
 {
@@ -58,13 +80,14 @@ static void do_compile_coverage_tests(struct manifest *m,
        struct ccan_file *i;
        struct list_head *h;
        bool ok;
-       char *f = talloc_asprintf(score, "%s %s", cflags, COVERAGE_CFLAGS);
+       char *f = cflags_list(m);
+       tal_append_fmt(&f, " %s", COVERAGE_CFLAGS);
 
        /* For API tests, we need coverage version of module. */
        if (!list_empty(&m->api_tests)) {
-               build_objects(m, keep, score, f, COMPILE_COVERAGE);
+               build_objects(m, score, f, COMPILE_COVERAGE);
                if (!score->pass) {
-                       score->error = talloc_strdup(score,
+                       score->error = tal_strdup(score,
                                                     "Failed to compile module objects with coverage");
                        return;
                }
@@ -72,8 +95,7 @@ static void do_compile_coverage_tests(struct manifest *m,
 
        foreach_ptr(h, &m->run_tests, &m->api_tests) {
                list_for_each(h, i, list) {
-                       cov_compile(m, *timeleft, m, i, h == &m->api_tests,
-                                   keep);
+                       cov_compile(m, *timeleft, m, i, h == &m->api_tests);
                }
        }