X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fccanlint%2Fcompulsory_tests%2Frun_tests.c;h=e2ab9226964e4287ca4ba61289e56292f1f6b515;hb=09fde153ba7a68715dcad3b53cbbb8804c3d2356;hp=b3c1188de592f4eece24b81cfa45561dc0a83be3;hpb=5f44c8ca0eb66503db51e0df1b65ff173eb42f57;p=ccan

diff --git a/tools/ccanlint/compulsory_tests/run_tests.c b/tools/ccanlint/compulsory_tests/run_tests.c
index b3c1188d..e2ab9226 100644
--- a/tools/ccanlint/compulsory_tests/run_tests.c
+++ b/tools/ccanlint/compulsory_tests/run_tests.c
@@ -27,7 +27,9 @@ struct run_tests_result {
 	const char *output;
 };
 
-static void *do_run_tests(struct manifest *m)
+static void *do_run_tests(struct manifest *m,
+			  bool keep,
+			  unsigned int *timeleft)
 {
 	struct list_head *list = talloc(m, struct list_head);
 	struct run_tests_result *res;
@@ -38,8 +40,7 @@ static void *do_run_tests(struct manifest *m)
 
 	list_for_each(&m->run_tests, i, list) {
 		run_tests.total_score++;
-		/* FIXME: timeout here */
-		cmdout = run_command(m, i->compiled);
+		cmdout = run_command(m, timeleft, i->compiled);
 		if (cmdout) {
 			res = talloc(list, struct run_tests_result);
 			res->file = i;
@@ -50,8 +51,7 @@ static void *do_run_tests(struct manifest *m)
 
 	list_for_each(&m->api_tests, i, list) {
 		run_tests.total_score++;
-		/* FIXME: timeout here */
-		cmdout = run_command(m, i->compiled);
+		cmdout = run_command(m, timeleft, i->compiled);
 		if (cmdout) {
 			res = talloc(list, struct run_tests_result);
 			res->file = i;
@@ -92,6 +92,9 @@ static const char *describe_run_tests(struct manifest *m,
 	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;
@@ -104,11 +107,13 @@ static void run_under_debugger(struct manifest *m, void *check_result)
 	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);
-	system(command);
+	if (system(command))
+		doesnt_matter();
 }
 
 struct ccanlint run_tests = {
-	.name = "run and api tests run successfully",
+	.key = "run",
+	.name = "Module's run and api tests pass",
 	.score = score_run_tests,
 	.check = do_run_tests,
 	.describe = describe_run_tests,