X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_run.c;h=0e473ca4050d142d1845563f3ea9a1e742f37629;hb=6aa2f4e347e5d66a392b879fe901bc582099a552;hp=5c06c263e5228ebc0fffaf9e19abdc9ce6f7503e;hpb=caf366998b97b7cc29bc1f33c285feb2f5d33bff;p=ccan

diff --git a/tools/ccanlint/tests/examples_run.c b/tools/ccanlint/tests/examples_run.c
index 5c06c263..0e473ca4 100644
--- a/tools/ccanlint/tests/examples_run.c
+++ b/tools/ccanlint/tests/examples_run.c
@@ -1,6 +1,5 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/foreach/foreach.h>
 #include <ccan/str/str.h>
 #include <ccan/cast/cast.h>
@@ -60,7 +59,7 @@ static bool scan_forv(const void *ctx,
 		for (len = 1; input[len-1]; len++) {
 			ret = scan_forv(ctx, input + len, fmt+2, &ap);
 			if (ret) {
-				*p = talloc_strndup(ctx, input, len);
+				*p = tal_strndup(ctx, input, len);
 				ret = true;
 				break;
 			}
@@ -208,12 +207,12 @@ static char *unexpected(struct ccan_file *i, const char *input,
 	bool ok;
 	unsigned int default_time = default_timeout_ms;
 
-	cmd = talloc_asprintf(i, "echo '%s' | %s %s",
-			      input, i->compiled, input);
+	cmd = tal_fmt(i, "echo '%s' | %s %s",
+		      input, i->compiled[COMPILE_NORMAL], input);
 
 	output = run_with_timeout(i, cmd, &ok, &default_time);
 	if (!ok)
-		return talloc_asprintf(i, "Exited with non-zero status\n");
+		return tal_fmt(i, "Exited with non-zero status\n");
 
 	if (exact) {
 		if (streq(output, expect) || streq(trim(output), expect))
@@ -225,7 +224,7 @@ static char *unexpected(struct ccan_file *i, const char *input,
 	return output;
 }
 
-static void run_examples(struct manifest *m, bool keep,
+static void run_examples(struct manifest *m,
 			 unsigned int *timeleft, struct score *score)
 {
 	struct ccan_file *i;
@@ -248,7 +247,7 @@ static void run_examples(struct manifest *m, bool keep,
 			     linenum++,
 				     expect = find_expect(i, lines, &input,
 							  &exact, &linenum)) {
-				if (i->compiled == NULL)
+				if (i->compiled[COMPILE_NORMAL] == NULL)
 					continue;
 
 				score->total++;
@@ -268,6 +267,7 @@ static void run_examples(struct manifest *m, bool keep,
 	}
 }
 
+/* FIXME: Test with reduced features, valgrind! */
 struct ccanlint examples_run = {
 	.key = "examples_run",
 	.name = "Module examples with expected output give that output",