X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Frun_tests.c;h=559a637880915a0e6b39c7fcd789cc855eeab441;hb=cbd27e92c3e00e004b50ac998d131e52ac1290ea;hp=e996c4e2607f9e24aab424659b039bc5ccacade6;hpb=4e0dfdadf206c74dc9e5f302545b2419cc4798f4;p=ccan

diff --git a/tools/ccanlint/tests/run_tests.c b/tools/ccanlint/tests/run_tests.c
index e996c4e2..559a6378 100644
--- a/tools/ccanlint/tests/run_tests.c
+++ b/tools/ccanlint/tests/run_tests.c
@@ -21,70 +21,106 @@ static const char *can_run(struct manifest *m)
 	return NULL;
 }
 
-static void *do_run_tests(struct manifest *m)
+struct run_tests_result {
+	struct list_node list;
+	struct ccan_file *file;
+	const char *output;
+};
+
+static void *do_run_tests(struct manifest *m,
+			  bool keep,
+			  unsigned int *timeleft)
 {
 	struct list_head *list = talloc(m, struct list_head);
-	char *failures = talloc_strdup(m, "");
+	struct run_tests_result *res;
 	struct ccan_file *i;
+	char *cmdout;
 
 	list_head_init(list);
-
 	run_tests.total_score = 0;
+
 	list_for_each(&m->run_tests, i, list) {
-		char *testout;
 		run_tests.total_score++;
-		/* FIXME: timeout here */
-		testout = run_command(m, i->compiled);
-		if (!testout)
-			continue;
-		failures = talloc_asprintf_append(failures,
-						  "Running %s failed:\n",
-						  i->name);
-		failures = talloc_append_string(failures, testout);
+		cmdout = run_command(m, timeleft, i->compiled);
+		if (cmdout) {
+			res = talloc(list, struct run_tests_result);
+			res->file = i;
+			res->output = talloc_steal(res, cmdout);
+			list_add_tail(list, &res->list);
+		}
 	}
 
 	list_for_each(&m->api_tests, i, list) {
-		char *testout;
 		run_tests.total_score++;
-		/* FIXME: timeout here */
-		testout = run_command(m, i->compiled);
-		if (!testout)
-			continue;
-		failures = talloc_asprintf_append(failures,
-						  "Running %s failed:\n",
-						  i->name);
-		failures = talloc_append_string(failures, testout);
+		cmdout = run_command(m, timeleft, i->compiled);
+		if (cmdout) {
+			res = talloc(list, struct run_tests_result);
+			res->file = i;
+			res->output = talloc_steal(res, cmdout);
+			list_add_tail(list, &res->list);
+		}
 	}
 
-	if (streq(failures, "")) {
-		talloc_free(failures);
-		failures = NULL;
+	if (list_empty(list)) {
+		talloc_free(list);
+		list = NULL;
 	}
 
-	return failures;
+	return list;
 }
 
 static unsigned int score_run_tests(struct manifest *m, void *check_result)
 {
-	/* FIXME: be cleverer here */
-	return 0;
+	struct list_head *list = check_result;
+	struct run_tests_result *i;
+	unsigned int score = run_tests.total_score;
+
+	list_for_each(list, i, list)
+		score--;
+	return score;
 }
 
 static const char *describe_run_tests(struct manifest *m,
 					  void *check_result)
 {
+	struct list_head *list = check_result;
 	char *descrip = talloc_strdup(check_result, "Running tests failed:\n");
+	struct run_tests_result *i;
 
-	return talloc_append_string(descrip, check_result);
+	list_for_each(list, i, list)
+		descrip = talloc_asprintf_append(descrip, "Running %s:\n%s",
+						 i->file->name, i->output);
+	return descrip;
+}
+
+/* Gcc's warn_unused_result is fascist bullshit. */
+#define doesnt_matter()
+
+static void run_under_debugger(struct manifest *m, void *check_result)
+{
+	char *command;
+	struct list_head *list = check_result;
+	struct run_tests_result *first;
+
+	if (!ask("Should I run the first failing test under the debugger?"))
+		return;
+
+	first = list_top(list, struct run_tests_result, list);
+	command = talloc_asprintf(m, "gdb -ex 'break tap.c:136' -ex 'run' %s",
+				  first->file->compiled);
+	if (system(command))
+		doesnt_matter();
 }
 
 struct ccanlint run_tests = {
-	.name = "run and api tests run successfully",
-	.total_score = 1,
+	.key = "run",
+	.name = "Module's run and api tests pass",
 	.score = score_run_tests,
+	.total_score = 1,
 	.check = do_run_tests,
 	.describe = describe_run_tests,
 	.can_run = can_run,
+	.handle = run_under_debugger
 };
 
 REGISTER_TEST(run_tests, &compile_tests, NULL);