if ((!score->pass && !quiet)
|| (score->score < score->total && verbose)
|| verbose > 1) {
- printf("%s: %s", i->name, score->pass ? "PASS" : "FAIL");
+ printf("%s (%s): %s", i->name, i->key, score->pass ? "PASS" : "FAIL");
if (score->total > 1)
printf(" (+%u/%u)", score->score, score->total);
printf("\n");
}
if ((!quiet && !score->pass) || verbose) {
- struct file_error *f;
- unsigned int lines = 1;
-
if (score->error)
- printf("%s%s\n", score->error,
- list_empty(&score->per_file_errors) ? "" : ":");
-
- list_for_each(&score->per_file_errors, f, list) {
- if (f->line)
- printf("%s:%u:%s\n",
- f->file->fullname, f->line, f->error);
- else if (f->file)
- printf("%s:%s\n", f->file->fullname, f->error);
- else
- printf("%s\n", f->error);
- if (verbose < 2 && ++lines > 5) {
- printf("... more (use -vv to see them all)\n");
- break;
- }
- }
+ printf("%s", score->error);
if (!quiet && !score->pass && i->handle)
i->handle(m, score);
}
if (dir[0] != '/')
dir = talloc_asprintf_append(NULL, "%s/%s", base_dir, dir);
+ while (strends(dir, "/"))
+ dir[strlen(dir)-1] = '\0';
if (dir != base_dir)
prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
if (verbose >= 3)