X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=e8fb2451e253b80181d525de76a5a42c2a1e4f70;hp=a3a3d1d595c88a5e8cfb7384c99b087aa416df64;hb=8566131a68d4e0e5e10a5179bd50e18106ac646d;hpb=c44953a9b9e6114690968294662fc5120e674cd2

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index a3a3d1d5..e8fb2451 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -431,6 +431,23 @@ static struct ccan_file *mangle_example(struct manifest *m,
 	return f;
 }
 
+/* If an example has expected output, it's complete and should not be
+ * included in future examples. */
+static bool has_expected_output(char **lines)
+{
+	unsigned int i;
+
+	for (i = 0; lines[i]; i++) {
+		char *p = lines[i] + strspn(lines[i], " \t");
+		if (!strstarts(p, "//"))
+			continue;
+		p += strspn(p, "/ ");
+		if (strncasecmp(p, "given", strlen("given")) == 0)
+			return true;
+	}
+	return false;
+}
+
 static void build_examples(struct manifest *m, bool keep,
 			   unsigned int *timeleft, struct score *score)
 {
@@ -450,33 +467,37 @@ static void build_examples(struct manifest *m, bool keep,
 		strip_leading_whitespace(get_ccan_file_lines(i));
 		ret = compile(i, m, i, keep);
 		if (!ret) {
-			prev = get_ccan_file_lines(i);
+			char **lines = get_ccan_file_lines(i);
+			if (!has_expected_output(lines))
+				prev = lines;
 			score->score++;
 			continue;
 		}
 
-		/* Try standalone. */
-		mangle1 = mangle_example(m, i, get_ccan_file_lines(i), keep);
-		ret1 = compile(i, m, mangle1, keep);
-		if (!ret1) {
-			prev = get_ccan_file_lines(i);
-			score->score++;
-			continue;
-		}
-
-		/* Try combining with previous (successful) example... */
 		if (prev) {
 			char **new = combine(i, get_ccan_file_lines(i), prev);
 
 			mangle2 = mangle_example(m, i, new, keep);
 			ret2 = compile(i, m, mangle2, keep);
 			if (!ret2) {
-				prev = new;
+				if (!has_expected_output(new))
+					prev = new;
 				score->score++;
 				continue;
 			}
 		}
 
+		/* Try standalone. */
+		mangle1 = mangle_example(m, i, get_ccan_file_lines(i), keep);
+		ret1 = compile(i, m, mangle1, keep);
+		if (!ret1) {
+			char **lines = get_ccan_file_lines(i);
+			if (!has_expected_output(lines))
+				prev = lines;
+			score->score++;
+			continue;
+		}
+
 		score->pass = false;
 		score->error = "Compiling extracted examples failed";
 		if (!verbose) {