Add scores/ directory to .gitignore.

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

diff --git a/tools/ccanlint/tests/compile_tests.c b/tools/ccanlint/tests/compile_tests.c
index 062912d427ea3bb49e2b22a71cca94082c606df3..80ebe913da7b227945d15e227225e16d609773c8 100644 (file)
--- a/tools/ccanlint/tests/compile_tests.c
+++ b/tools/ccanlint/tests/compile_tests.c
@@ -2,6 +2,7 @@
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -21,16 +22,12 @@ static const char *can_build(struct manifest *m)
        return NULL;
 }
 
+/* FIXME: Merge this into one place. */
 static char *obj_list(const struct manifest *m, bool link_with_module)
 {
-       char *list;
+       char *list = talloc_strdup(m, "");
        struct ccan_file *i;
-
-       /* We expect to be linked with tap, unless that's us. */
-       if (!streq(m->basename, "tap"))
-               list = talloc_asprintf(m, "%s/ccan/tap.o", ccan_dir);
-       else
-               list = talloc_strdup(m, "");
+       struct manifest *subm;
 
        /* Objects from any other C files. */
        list_for_each(&m->other_test_c_files, i, list)
@@ -42,9 +39,10 @@ static char *obj_list(const struct manifest *m, bool link_with_module)
                        list = talloc_asprintf_append(list, " %s", i->compiled);
 
        /* Other ccan modules. */
-       list_for_each(&m->dep_dirs, i, list) {
-               if (i->compiled)
-                       list = talloc_asprintf_append(list, " %s", i->compiled);
+       list_for_each(&m->deps, subm, list) {
+               if (subm->compiled)
+                       list = talloc_asprintf_append(list, " %s",
+                                                     subm->compiled);
        }
 
        return list;
@@ -53,7 +51,7 @@ static char *obj_list(const struct manifest *m, bool link_with_module)
 static char *lib_list(const struct manifest *m)
 {
        unsigned int i, num;
-       char **libs = get_libs(m, ".", &num, &m->info_file->compiled);
+       char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
        char *ret = talloc_strdup(m, "");
 
        for (i = 0; i < num; i++)
@@ -61,25 +59,22 @@ static char *lib_list(const struct manifest *m)
        return ret;
 }
 
-static char *compile(const void *ctx,
-                    struct manifest *m,
-                    struct ccan_file *file,
-                    bool fail,
-                    bool link_with_module,
-                    bool keep)
+static bool compile(const void *ctx,
+                   struct manifest *m,
+                   struct ccan_file *file,
+                   bool fail,
+                   bool link_with_module,
+                   bool keep, char **output)
 {
-       char *errmsg;
-
        file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
-       errmsg = compile_and_link(ctx, file->fullname, ccan_dir,
-                                 obj_list(m, link_with_module),
-                                 fail ? "-DFAIL" : "",
-                                 lib_list(m), file->compiled);
-       if (errmsg) {
+       if (!compile_and_link(ctx, file->fullname, ccan_dir,
+                             obj_list(m, link_with_module),
+                             fail ? "-DFAIL" : "",
+                             lib_list(m), file->compiled, output)) {
                talloc_free(file->compiled);
-               return errmsg;
+               return false;
        }
-       return NULL;
+       return true;
 }
 
 static void do_compile_tests(struct manifest *m,
@@ -88,44 +83,42 @@ static void do_compile_tests(struct manifest *m,
 {
        char *cmdout;
        struct ccan_file *i;
-
-       list_for_each(&m->compile_ok_tests, i, list) {
-               cmdout = compile(score, m, i, false, false, keep);
-               if (cmdout) {
-                       score->error = "Failed to compile tests";
-                       score_file_error(score, i, 0, cmdout);
-               }
-       }
-
-       list_for_each(&m->run_tests, i, list) {
-               cmdout = compile(score, m, i, false, false, keep);
-               if (cmdout) {
-                       score->error = "Failed to compile tests";
-                       score_file_error(score, i, 0, cmdout);
-               }
-       }
-
-       list_for_each(&m->api_tests, i, list) {
-               cmdout = compile(score, m, i, false, true, keep);
-               if (cmdout) {
-                       score->error = "Failed to compile tests";
-                       score_file_error(score, i, 0, cmdout);
+       struct list_head *list;
+       bool errors = false, warnings = false;
+
+       foreach_ptr(list, &m->compile_ok_tests, &m->run_tests, &m->api_tests) {
+               list_for_each(list, i, list) {
+                       if (!compile(score, m, i, false, list == &m->api_tests,
+                                    keep, &cmdout)) {
+                               score->error = "Failed to compile tests";
+                               score_file_error(score, i, 0, cmdout);
+                               errors = true;
+                       } else if (!streq(cmdout, "")) {
+                               score->error = "Test compiled with warnings";
+                               score_file_error(score, i, 0, cmdout);
+                               warnings = true;
+                       }
                }
        }
 
        /* The compile fail tests are a bit weird, handle them separately */
-       if (score->error)
+       if (errors)
                return;
 
+       /* For historical reasons, "fail" often means "gives warnings" */
        list_for_each(&m->compile_fail_tests, i, list) {
-               cmdout = compile(score, m, i, false, false, false);
-               if (cmdout) {
+               if (!compile(score, m, i, false, false, false, &cmdout)) {
                        score->error = "Failed to compile without -DFAIL";
                        score_file_error(score, i, 0, cmdout);
                        return;
                }
-               cmdout = compile(score, m, i, true, false, false);
-               if (!cmdout) {
+               if (!streq(cmdout, "")) {
+                       score->error = "Compile with warnigns without -DFAIL";
+                       score_file_error(score, i, 0, cmdout);
+                       return;
+               }
+               if (compile(score, m, i, true, false, false, &cmdout)
+                   && streq(cmdout, "")) {
                        score->error = "Compiled successfully with -DFAIL?";
                        score_file_error(score, i, 0, NULL);
                        return;
@@ -133,7 +126,8 @@ static void do_compile_tests(struct manifest *m,
        }
 
        score->pass = true;
-       score->score = score->total;
+       score->total = 2;
+       score->score = 1 + !warnings;
 }
 
 struct ccanlint compile_tests = {