ccanlint: fix compilation of chained examples.
authorRusty Russell <rusty@rustcorp.com.au>
Sun, 7 Nov 2010 01:42:31 +0000 (12:12 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sun, 7 Nov 2010 01:42:31 +0000 (12:12 +1030)
Broken in 5378c864f9c37f39d906f599285da25a7db0c9fe: we were trying to
recompile the previous failed version.  And the message we printed out
was unclear.

tools/ccanlint/tests/examples_compile.c

index 88530e2b270bb00821454103bbc0dec8c7839985..80c5ba631375e58bd24d78463b6aa65139434679 100644 (file)
@@ -473,7 +473,7 @@ static void *build_examples(struct manifest *m, bool keep,
                        char **new = combine(i, get_ccan_file_lines(i), prev);
 
                        mangle2 = mangle_example(m, i, new, keep);
-                       ret2 = compile(i, m, mangle1, keep);
+                       ret2 = compile(i, m, mangle2, keep);
                        if (!ret2) {
                                prev = new;
                                score->score++;
@@ -498,9 +498,9 @@ static void *build_examples(struct manifest *m, bool keep,
 
                if (mangle2) {
                        score->errors = talloc_asprintf_append(score->errors,
-                                      "%s\n"
                                       "%s: tried combining with"
                                       " previous example:\n"
+                                      "%s\n"
                                       "Errors: %s\n\n",
                                       i->name,
                                       get_ccan_file_contents(mangle2),