X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=d09f68da19dc94932f4ba05d09a44d550e121608;hb=7ddfc6696d29eacb3d4d896aac93721aee45d844;hp=8f36c2aa521f2d3c2132c508e367a1376fbbe2fa;hpb=eaca6b486a6714857f007950e770ac8f6b244511;p=ccan-lca-2011.git

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 8f36c2a..d09f68d 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -149,8 +149,9 @@ 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%s\n", score->error,
@@ -164,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);
 	}
 
@@ -464,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);