X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=1399edcbc0772dc9eb17a021ab03a772286b88fd;hb=b7f7224b320e4659d0e2d9eba503a1713ede3b48;hp=f88b58dc8e8ba3b416bb10a1469684258782c1bb;hpb=3460418c419dfcc84316ad65497b0a00950480b9;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index f88b58dc..1399edcb 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -68,6 +68,19 @@ bool ask(const char *question)
 		&& toupper(reply[0]) == 'Y';
 }
 
+static const char *should_skip(struct manifest *m, struct ccanlint *i)
+{
+	if (i->skip_fail)
+		return "dependency failed";
+
+	if (i->skip)
+		return "dependency was skipped";
+
+	if (i->can_run)
+		return i->can_run(m);
+	return NULL;
+}
+
 static bool run_test(struct ccanlint *i,
 		     bool summary,
 		     unsigned int *score,
@@ -77,18 +90,38 @@ static bool run_test(struct ccanlint *i,
 	void *result;
 	unsigned int this_score;
 	const struct dependent *d;
+	const char *skip;
 
-	if (i->total_score)
-		*total_score += i->total_score;
 	//one less test to run through
 	list_for_each(&i->dependencies, d, node)
 		d->dependent->num_depends--;
+
+	skip = should_skip(m, i);
+	if (skip) {
+		if (verbose)
+			printf("  %s: skipped (%s)\n", i->name, skip);
+
+		/* If we're skipping this because a prereq failed, we fail. */
+		if (i->skip_fail)
+			*total_score += i->total_score;
+			
+		list_del(&i->list);
+		list_add_tail(&finished_tests, &i->list);
+		list_for_each(&i->dependencies, d, node) {
+			d->dependent->skip = true;
+			d->dependent->skip_fail = i->skip_fail;
+		}
+		return true;
+	}
+
 	result = i->check(m);
 	if (!result) {
 		if (verbose)
 			printf("  %s: OK\n", i->name);
-		if (i->total_score)
+		if (i->total_score) {
 			*score += i->total_score;
+			*total_score += i->total_score;
+		}
 
 		list_del(&i->list);
 		list_add_tail(&finished_tests, &i->list);
@@ -103,6 +136,7 @@ static bool run_test(struct ccanlint *i,
 	list_del(&i->list);
 	list_add_tail(&finished_tests, &i->list);
 
+	*total_score += i->total_score;
 	*score += this_score;
 	if (summary) {
 		printf("%s FAILED (%u/%u)\n",
@@ -119,26 +153,20 @@ static bool run_test(struct ccanlint *i,
 
 	/* Skip any tests which depend on this one. */
 	list_for_each(&i->dependencies, d, node) {
-		list_del(&d->dependent->list);
-		list_add(&finished_tests, &d->dependent->list);
-		if (verbose)
-			printf("  -> skipping %s\n", d->dependent->name);
-		*total_score += d->dependent->total_score;
+		d->dependent->skip = true;
+		d->dependent->skip_fail = true;
 	}
 
 	return false;
 }
 
-static void register_test(struct ccanlint *test, ...)
+static void register_test(struct list_head *h, struct ccanlint *test, ...)
 {
 	va_list ap;
 	struct ccanlint *depends;
 	struct dependent *dchild;
 
-	if (!test->total_score)
-		list_add(&compulsory_tests, &test->list);
-	else
-		list_add(&normal_tests, &test->list);
+	list_add(h, &test->list);
 
 	va_start(ap, test);
 	/* Careful: we might have been initialized by a dependent. */
@@ -180,8 +208,11 @@ static void init_tests(void)
 	const struct ccanlint *i;
 
 #undef REGISTER_TEST
-#define REGISTER_TEST(name, ...) register_test(&name, __VA_ARGS__)
-#include "generated-init-tests"
+#define REGISTER_TEST(name, ...) register_test(&normal_tests, &name, __VA_ARGS__)
+#include "generated-normal-tests"
+#undef REGISTER_TEST
+#define REGISTER_TEST(name, ...) register_test(&compulsory_tests, &name, __VA_ARGS__)
+#include "generated-compulsory-tests"
 
 	if (!verbose)
 		return;
@@ -258,10 +289,9 @@ int main(int argc, char *argv[])
 	if (verbose)
 		printf("\nNormal tests:\n");
 	score = total_score = 0;
-	while ((i = get_next_test(&normal_tests)) != NULL) {
-		if (i->total_score)
-			run_test(i, summary, &score, &total_score, m);
-	}
+	while ((i = get_next_test(&normal_tests)) != NULL)
+		run_test(i, summary, &score, &total_score, m);
+
 	printf("Total score: %u/%u\n", score, total_score);
 	return 0;
 }