X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=064e40d869d6703da46270ce16e67a95488d3895;hb=747a69435d9f83c0968d9689c4951bc0233ffc5e;hp=be6829c049d8420d5cefd76931ca09bf77a49825;hpb=61088f5c752c555172e2ab6cf93a7967f79f3f2c;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index be6829c0..064e40d8 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -17,6 +17,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "ccanlint.h"
+#include "../tools.h"
 #include <unistd.h>
 #include <getopt.h>
 #include <stdarg.h>
@@ -37,13 +38,14 @@ static void usage(const char *name)
 {
 	fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-d <dirname>]\n"
 		"   -v: verbose mode\n"
-		"   -s: simply give one line per FAIL and total score\n"
+		"   -s: simply give one line summary\n"
 		"   -d: use this directory instead of the current one\n"
 		"   -n: do not compile anything\n",
 		name);
 	exit(1);
 }
 
+#if 0
 static void indent_print(const char *string)
 {
 	while (*string) {
@@ -56,6 +58,7 @@ static void indent_print(const char *string)
 		string += line;
 	}
 }
+#endif
 
 bool ask(const char *question)
 {
@@ -82,7 +85,7 @@ static const char *should_skip(struct manifest *m, struct ccanlint *i)
 }
 
 static bool run_test(struct ccanlint *i,
-		     bool summary,
+		     bool quiet,
 		     unsigned int *score,
 		     unsigned int *total_score,
 		     struct manifest *m)
@@ -138,13 +141,7 @@ static bool run_test(struct ccanlint *i,
 
 	*total_score += i->total_score;
 	*score += this_score;
-	if (summary) {
-		printf("%s FAILED (%u/%u)\n",
-		       i->name, this_score, i->total_score);
-
-		if (verbose)
-			indent_print(i->describe(m, result));
-	} else {
+	if (!quiet) {
 		printf("%s\n", i->describe(m, result));
 
 		if (i->handle)
@@ -160,16 +157,13 @@ static bool run_test(struct ccanlint *i,
 	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. */
@@ -211,8 +205,11 @@ static void init_tests(void)
 	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;
@@ -244,17 +241,20 @@ int main(int argc, char *argv[])
 {
 	int c;
 	bool summary = false;
-	unsigned int score, total_score;
+	unsigned int score = 0, total_score = 0;
 	struct manifest *m;
 	struct ccanlint *i;
+	const char *prefix = "", *dir = ".";
 
 	/* I'd love to use long options, but that's not standard. */
 	/* FIXME: getopt_long ccan package? */
 	while ((c = getopt(argc, argv, "sd:vn")) != -1) {
 		switch (c) {
 		case 'd':
-			if (chdir(optarg) != 0)
-				err(1, "Changing into directory '%s'", optarg);
+			dir = optarg;
+			prefix = talloc_append_string(talloc_basename(NULL,
+								      optarg),
+						      ": ");
 			break;
 		case 's':
 			summary = true;
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
 	if (optind < argc)
 		usage(argv[0]);
 
-	m = get_manifest(talloc_autofree_context());
+	m = get_manifest(talloc_autofree_context(), dir);
 
 	init_tests();
 
@@ -282,17 +282,16 @@ int main(int argc, char *argv[])
 		printf("Compulsory tests:\n");
 
 	while ((i = get_next_test(&compulsory_tests)) != NULL) {
-		if (!run_test(i, summary, &score, &total_score, m))
-			exit(1);
+		if (!run_test(i, summary, &score, &total_score, m)) {
+			errx(1, "%s%s failed", prefix, i->name);
+		}
 	}
 
 	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);
-	}
-	printf("Total score: %u/%u\n", score, total_score);
+	while ((i = get_next_test(&normal_tests)) != NULL)
+		run_test(i, summary, &score, &total_score, m);
+
+	printf("%sTotal score: %u/%u\n", prefix, score, total_score);
 	return 0;
 }