X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_run.c;h=4cf9242297988ad64b75835f098799aea52c2915;hb=6c1d3e2739e97674069862ec7369677d25e80312;hp=3cb456d49fa69d38f073f76229aa706b1ccb8e5a;hpb=a40b318e7a07a452ae7456053727bd11b2fa49b4;p=ccan

diff --git a/tools/ccanlint/tests/examples_run.c b/tools/ccanlint/tests/examples_run.c
index 3cb456d4..4cf92422 100644
--- a/tools/ccanlint/tests/examples_run.c
+++ b/tools/ccanlint/tests/examples_run.c
@@ -26,7 +26,7 @@ static const char *can_run(struct manifest *m)
 
 /* Very dumb scanner, allocates %s-strings. */
 static bool scan_forv(const void *ctx,
-		      const char *input, const char *fmt, const va_list *args)
+		      const char *input, const char *fmt, va_list *args)
 {
 	va_list ap;
 	bool ret;
@@ -247,24 +247,20 @@ static void run_examples(struct manifest *m, bool keep,
 			     linenum++,
 				     expect = find_expect(i, lines, &input,
 							  &exact, &linenum)) {
-				char *err;
-				score->total++;
 				if (i->compiled == NULL)
 					continue;
 
+				score->total++;
 				output = unexpected(i, input, expect, exact);
 				if (!output) {
 					score->score++;
 					continue;
 				}
-				err = talloc_asprintf(score,
-						      "output '%s' didn't"
-						      " %s '%s'\n",
-						      output,
-						      exact
-						      ? "match" : "contain",
-						      expect);
-				score_file_error(score, i, linenum+1, err);
+				score_file_error(score, i, linenum+1,
+						 "output '%s' didn't %s '%s'\n",
+						 output,
+						 exact ? "match" : "contain",
+						 expect);
 				score->pass = false;
 			}
 		}
@@ -272,10 +268,11 @@ static void run_examples(struct manifest *m, bool keep,
 }
 
 struct ccanlint examples_run = {
-	.key = "examples-run",
+	.key = "examples_run",
 	.name = "Module examples with expected output give that output",
 	.check = run_examples,
 	.can_run = can_run,
+	.needs = "examples_compile"
 };
 
-REGISTER_TEST(examples_run, &examples_compile, NULL);
+REGISTER_TEST(examples_run);