ccanlint: only compile _info once; speeds tdb test from 18 to 16 seconds.

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

diff --git a/tools/ccanlint/tests/build_objs.c b/tools/ccanlint/tests/build_objs.c
index dc6e4d358f7d11c166754c406615dbabeb81cf11..e0ea222350bc981ed3075270a0db3ee7459cf1f1 100644 (file)
--- a/tools/ccanlint/tests/build_objs.c
+++ b/tools/ccanlint/tests/build_objs.c
@@ -23,15 +23,14 @@ static const char *can_build(struct manifest *m)
 
 static bool compile_obj(struct ccan_file *c_file, char *objfile, char **report)
 {
-       char *contents;
+       char *err;
 
-       contents = run_command(objfile, "cc " CFLAGS " -o %s -c %s",
-                              objfile, c_file->name);
-       if (contents) {
+       err = compile_object(objfile, objfile, c_file->name);
+       if (err) {
                if (*report)
-                       *report = talloc_append_string(*report, contents);
+                       *report = talloc_append_string(*report, err);
                else
-                       *report = contents;
+                       *report = err;
                return false;
        }
        return true;
@@ -49,7 +48,6 @@ static void *check_objs_build(struct manifest *m)
        struct ccan_file *i;
 
        /* One point for each obj file. */
-       build_objs.total_score = 0;
        list_for_each(&m->c_files, i, list)
                build_objs.total_score++;
 
@@ -71,7 +69,6 @@ static const char *describe_objs_build(struct manifest *m, void *check_result)
 
 struct ccanlint build_objs = {
        .name = "Module object files can be built",
-       .total_score = 1,
        .check = check_objs_build,
        .describe = describe_objs_build,
        .can_run = can_build,