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

diff --git a/tools/ccanlint/compulsory_tests/run_tests.c b/tools/ccanlint/compulsory_tests/run_tests.c
index b3c1188d..9f1f4a4a 100644
--- a/tools/ccanlint/compulsory_tests/run_tests.c
+++ b/tools/ccanlint/compulsory_tests/run_tests.c
@@ -27,19 +27,29 @@ 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;
 	struct ccan_file *i;
 	char *cmdout;
+	char *olddir;
+
+	/* We run tests in the module directory, so any paths
+	 * referenced can all be module-local. */
+	olddir = talloc_getcwd(m);
+	if (!olddir)
+		err(1, "Could not save cwd");
+	if (chdir(m->dir) != 0)
+		err(1, "Could not chdir to %s", m->dir);
 
 	list_head_init(list);
 
 	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 +60,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;
@@ -65,6 +74,9 @@ static void *do_run_tests(struct manifest *m)
 		list = NULL;
 	}
 
+	if (chdir(olddir) != 0)
+		err(1, "Could not chdir to %s", olddir);
+
 	return list;
 }
 
@@ -92,6 +104,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 +119,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,