X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=d65a4a43a7412632f6cbcfa0d0301f8c818d0cfe;hb=501e192029768948a81aeef6515f5d0dd6519f37;hp=20c3b9bf0e64df23d4d1bd76c601122a0792f43b;hpb=021e03c4186bde630b1b4912afaab1e7f8417c1e;p=ccan

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 20c3b9bf..d65a4a43 100644
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -41,12 +41,13 @@ static unsigned int timeout;
 
 static void usage(const char *name)
 {
-	fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <tests>]\n"
+	fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <tests>] [-k <test>]*\n"
 		"   -v: verbose mode\n"
 		"   -s: simply give one line summary\n"
 		"   -d: use this directory instead of the current one\n"
 		"   -n: do not compile anything\n"
 		"   -l: list tests ccanlint performs\n"
+		"   -k: keep results of this test (can be used multiple times)\n"
 		"   -x: exclude tests (e.g. -x trailing_whitespace,valgrind)\n"
 		"   -t: ignore (terminate) tests that are slower than this\n",
 		name);
@@ -105,6 +106,7 @@ static bool run_test(struct ccanlint *i,
 	unsigned int this_score, timeleft;
 	const struct dependent *d;
 	const char *skip;
+	bool failed;
 
 	//one less test to run through
 	list_for_each(&i->dependencies, d, node)
@@ -131,57 +133,52 @@ static bool run_test(struct ccanlint *i,
 	}
 
 	timeleft = timeout ? timeout : default_timeout_ms;
-	result = i->check(m, &timeleft);
+	result = i->check(m, i->keep_results, &timeleft);
 	if (timeout && timeleft == 0) {
 		skip = "timeout";
 		goto skip;
 	}
-	if (!result) {
-		if (verbose) {
-			printf("  %s: OK", i->name);
-			if (i->total_score)
-				printf(" (+%u/%u)",
-				       i->total_score, i->total_score);
-			printf("\n");
-		}
-		if (i->total_score) {
-			*score += i->total_score;
-			*total_score += i->total_score;
-		}
-
-		list_del(&i->list);
-		list_add_tail(&finished_tests, &i->list);
-		return true;
-	}
 
-	if (i->score)
+	if (!result)
+		this_score = i->total_score ? i->total_score : 1;
+	else if (i->score)
 		this_score = i->score(m, result);
 	else
 		this_score = 0;
 
-	list_del(&i->list);
-	list_add_tail(&finished_tests, &i->list);
+	failed = (this_score == 0);
 
-	*total_score += i->total_score;
-	*score += this_score;
 	if (verbose) {
-		printf("  %s: FAIL (+%u/%u)\n",
-		       i->name, this_score, i->total_score);
+		printf("  %s: %s", i->name, failed ? "FAIL" : "OK");
+		if (i->total_score)
+			printf(" (+%u/%u)",
+				       this_score, i->total_score);
+		printf("\n");
 	}
-	if (!quiet) {
-		printf("%s\n", i->describe(m, result));
 
+	if (!quiet && result) {
+		if (i->describe && (failed || verbose))
+			printf("    %s\n", i->describe(m, result));
 		if (i->handle)
 			i->handle(m, result);
 	}
 
-	/* Skip any tests which depend on this one. */
-	list_for_each(&i->dependencies, d, node) {
-		d->dependent->skip = true;
-		d->dependent->skip_fail = true;
+	if (i->total_score) {
+		*score += this_score;
+		*total_score += i->total_score;
 	}
 
-	return false;
+	list_del(&i->list);
+	list_add_tail(&finished_tests, &i->list);
+
+	if (failed) {
+		/* Skip any tests which depend on this one. */
+		list_for_each(&i->dependencies, d, node) {
+			d->dependent->skip = true;
+			d->dependent->skip_fail = true;
+		}
+	}
+	return !failed;
 }
 
 static void register_test(struct list_head *h, struct ccanlint *test, ...)
@@ -284,6 +281,29 @@ static void init_tests(void)
 	}
 }
 
+static struct ccanlint *find_test(const char *key)
+{
+	struct ccanlint *i;
+
+	list_for_each(&compulsory_tests, i, list)
+		if (streq(i->key, key))
+			return i;
+
+	list_for_each(&normal_tests, i, list)
+		if (streq(i->key, key))
+			return i;
+
+	return NULL;
+}
+
+static void keep_test(const char *testname)
+{
+	struct ccanlint *i = find_test(testname);
+	if (!i)
+		errx(1, "No test %s to --keep", testname);
+	i->keep_results = true;
+}
+
 static void print_tests(struct list_head *tests, const char *type)
 {
 	struct ccanlint *i;
@@ -301,7 +321,6 @@ static void print_tests(struct list_head *tests, const char *type)
 
 static void list_tests(void)
 {
-	init_tests();
 	print_tests(&compulsory_tests, "Compulsory");
 	print_tests(&normal_tests, "Normal");
 	exit(0);
@@ -314,16 +333,22 @@ int main(int argc, char *argv[])
 	unsigned int score = 0, total_score = 0;
 	struct manifest *m;
 	struct ccanlint *i;
-	const char *prefix = "", *dir = ".";
+	const char *prefix = "", *dir = talloc_getcwd(NULL);
 	
+	init_tests();
+
 	exclude = btree_new(btree_strcmp);
 
 	/* I'd love to use long options, but that's not standard. */
-	/* FIXME: getopt_long ccan package? */
-	while ((c = getopt(argc, argv, "sd:vnlx:t:")) != -1) {
+	/* FIXME: popt ccan package? */
+	while ((c = getopt(argc, argv, "sd:vnlx:t:k:")) != -1) {
 		switch (c) {
 		case 'd':
-			dir = optarg;
+			if (optarg[0] != '/')
+				dir = talloc_asprintf_append(NULL, "%s/%s",
+							     dir, optarg);
+			else
+				dir = optarg;
 			prefix = talloc_append_string(talloc_basename(NULL,
 								      optarg),
 						      ": ");
@@ -339,6 +364,9 @@ int main(int argc, char *argv[])
 		case 'n':
 			safe_mode = true;
 			break;
+		case 'k':
+			keep_test(optarg);
+			break;
 		case 'x': {
 			char **exclude_strs = strsplit(NULL, optarg, ",", NULL);
 			size_t i;
@@ -359,9 +387,11 @@ int main(int argc, char *argv[])
 	if (optind < argc)
 		usage(argv[0]);
 
-	m = get_manifest(talloc_autofree_context(), dir);
+	/* We move into temporary directory, so gcov dumps its files there. */
+	if (chdir(temp_dir(talloc_autofree_context())) != 0)
+		err(1, "Error changing to %s temporary dir", temp_dir(NULL));
 
-	init_tests();
+	m = get_manifest(talloc_autofree_context(), dir);
 
 	/* If you don't pass the compulsory tests, you don't even get a score */
 	if (verbose)