X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Frun_tests_valgrind.c;h=6312a0a864327988c53b39f080eb0b6daedcaecc;hp=b89541f331475c510dd5a464b8826d418ce74003;hb=f952b88b36e3803370825fb43385f1a42aa24b64;hpb=d1d6625caf6e9897a4a0479c0e04fee27de5b20e

diff --git a/tools/ccanlint/tests/run_tests_valgrind.c b/tools/ccanlint/tests/run_tests_valgrind.c
index b89541f3..6312a0a8 100644
--- a/tools/ccanlint/tests/run_tests_valgrind.c
+++ b/tools/ccanlint/tests/run_tests_valgrind.c
@@ -36,11 +36,20 @@ static void *do_run_tests_vg(struct manifest *m)
 	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++;
+		run_tests_vg.total_score++;
 		/* FIXME: timeout here */
 		cmdout = run_command(m, "valgrind -q %s", i->compiled);
 		if (cmdout) {
@@ -52,7 +61,7 @@ static void *do_run_tests_vg(struct manifest *m)
 	}
 
 	list_for_each(&m->api_tests, i, list) {
-		run_tests.total_score++;
+		run_tests_vg.total_score++;
 		/* FIXME: timeout here */
 		cmdout = run_command(m, "valgrind -q %s", i->compiled);
 		if (cmdout) {
@@ -68,6 +77,9 @@ static void *do_run_tests_vg(struct manifest *m)
 		list = NULL;
 	}
 
+	if (chdir(olddir) != 0)
+		err(1, "Could not chdir to %s", olddir);
+
 	return list;
 }
 
@@ -75,7 +87,7 @@ static unsigned int score_run_tests_vg(struct manifest *m, void *check_result)
 {
 	struct list_head *list = check_result;
 	struct run_tests_result *i;
-	unsigned int score = run_tests.total_score;
+	unsigned int score = run_tests_vg.total_score;
 
 	list_for_each(list, i, list)
 		score--;
@@ -95,19 +107,27 @@ static const char *describe_run_tests_vg(struct manifest *m,
 	return descrip;
 }
 
+/* Gcc's warn_unused_result is fascist bullshit. */
+#define doesnt_matter()
+
 static void run_under_debugger_vg(struct manifest *m, void *check_result)
 {
 	struct list_head *list = check_result;
 	struct run_tests_result *first;
+	char *command;
 
 	if (!ask("Should I run the first failing test under the debugger?"))
 		return;
 
 	first = list_top(list, struct run_tests_result, list);
-	run_command(m, "valgrind --db-attach=yes %s", first->file->compiled);
+	command = talloc_asprintf(m, "valgrind --db-attach=yes %s",
+				  first->file->compiled);
+	if (system(command))
+		doesnt_matter();
 }
 
 struct ccanlint run_tests_vg = {
+	.key = "valgrind",
 	.name = "run and api tests under valgrind",
 	.score = score_run_tests_vg,
 	.check = do_run_tests_vg,