X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=d09f68da19dc94932f4ba05d09a44d550e121608;hb=7ddfc6696d29eacb3d4d896aac93721aee45d844;hp=44d828bb78cb132ac9a3c5998f1949874dd93d6f;hpb=83cfe17fd85efb7f5d8e8b1edb1f3c28b180a2ce;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 44d828bb..d09f68da 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -149,11 +149,13 @@ static bool run_test(struct ccanlint *i,
 		printf("\n");
 	}
 
-	if (!quiet && !score->pass) {
+	if ((!quiet && !score->pass) || verbose) {
 		struct file_error *f;
+		unsigned int lines = 1;
 
 		if (score->error)
-			printf("%s:\n", 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)
@@ -163,8 +165,12 @@ static bool run_test(struct ccanlint *i,
 				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;
+			}
 		}
-		if (i->handle)
+		if (!quiet && !score->pass && i->handle)
 			i->handle(m, score);
 	}
 
@@ -463,7 +469,10 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	add_info_fails(m->info_file);
+	/* --target overrides _info excludes */
+	if (!target)
+		add_info_fails(m->info_file);
+
 	while ((i = get_next_test(&normal_tests)) != NULL)
 		run_test(i, summary, &score, &total_score, m);