Commit bffcda42 authored by Rusty Russell's avatar Rusty Russell

ccanlint: run tests in parallel

Measuring ccanlint -d ccan/tdb2 on my dual core hyperthread laptop gives:
Before: 5:30
After: 3:31
parent 380372e7
...@@ -46,9 +46,9 @@ static const char *concat(struct score *score, char *bits[]) ...@@ -46,9 +46,9 @@ static const char *concat(struct score *score, char *bits[])
return ret; return ret;
} }
static bool run_test(void *ctx, static void run_test(void *ctx,
struct manifest *m, struct manifest *m,
unsigned int *timeleft, char **cmdout, unsigned int *timeleft,
struct ccan_file *i) struct ccan_file *i)
{ {
if (do_valgrind) { if (do_valgrind) {
...@@ -66,19 +66,20 @@ static bool run_test(void *ctx, ...@@ -66,19 +66,20 @@ static bool run_test(void *ctx,
talloc_set_destructor(i->valgrind_log, talloc_set_destructor(i->valgrind_log,
unlink_file_destructor); unlink_file_destructor);
return run_command(ctx, timeleft, cmdout, run_command_async(i, *timeleft,
"valgrind -q" "valgrind -q"
" --leak-check=full" " --leak-check=full"
" --log-fd=3 %s %s" " --log-fd=3 %s %s"
" 3> %s", " 3> %s",
options, options,
i->compiled[COMPILE_NORMAL], i->compiled[COMPILE_NORMAL],
i->valgrind_log); i->valgrind_log);
return;
} }
} }
return run_command(m, timeleft, cmdout, "%s", run_command_async(i, *timeleft, "%s",
i->compiled[COMPILE_NORMAL]); i->compiled[COMPILE_NORMAL]);
} }
static void do_run_tests(struct manifest *m, static void do_run_tests(struct manifest *m,
...@@ -89,20 +90,27 @@ static void do_run_tests(struct manifest *m, ...@@ -89,20 +90,27 @@ static void do_run_tests(struct manifest *m,
struct list_head *list; struct list_head *list;
struct ccan_file *i; struct ccan_file *i;
char *cmdout; char *cmdout;
bool ok;
score->total = 0; score->total = 0;
foreach_ptr(list, &m->run_tests, &m->api_tests) { foreach_ptr(list, &m->run_tests, &m->api_tests) {
list_for_each(list, i, list) { list_for_each(list, i, list) {
score->total++; score->total++;
if (verbose >= 2) if (verbose >= 2)
printf(" %s\n", i->name); printf(" %s...\n", i->name);
if (run_test(score, m, timeleft, &cmdout, i)) run_test(score, m, timeleft, i);
score->score++;
else
score_file_error(score, i, 0, "%s", cmdout);
} }
} }
while ((i = collect_command(&ok, &cmdout)) != NULL) {
if (!ok)
score_file_error(score, i, 0, "%s", cmdout);
else
score->score++;
if (verbose >= 2)
printf(" ...%s\n", i->name);
}
if (score->score == score->total) if (score->score == score->total)
score->pass = true; score->pass = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment