&& 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,
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);
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",
/* 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. */
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;
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;
}