ccanlint: Add -k option to keep results.

[ccan] / tools / ccanlint / tests / run_tests_valgrind.c

diff --git a/tools/ccanlint/tests/run_tests_valgrind.c b/tools/ccanlint/tests/run_tests_valgrind.c
index f4ab8f528df13aad2a78a4bd11613e497b2a5985..233a719dfb3eddfec896eeda3daa8ec48ed6320e 100644 (file)
--- a/tools/ccanlint/tests/run_tests_valgrind.c
+++ b/tools/ccanlint/tests/run_tests_valgrind.c
@@ -17,7 +17,8 @@
 /* Note: we already test safe_mode in run_tests.c */
 static const char *can_run_vg(struct manifest *m)
 {
 /* Note: we already test safe_mode in run_tests.c */
 static const char *can_run_vg(struct manifest *m)
 {

-       char *output = run_command(m, "valgrind -q true");
+       unsigned int timeleft = default_timeout_ms;
+       char *output = run_command(m, &timeleft, "valgrind -q true");

 
        if (output)
                return talloc_asprintf(m, "No valgrind support: %s", output);
 
        if (output)
                return talloc_asprintf(m, "No valgrind support: %s", output);


@@ -30,19 +31,30 @@ struct run_tests_result {
        const char *output;
 };
 
        const char *output;
 };
 

-static void *do_run_tests_vg(struct manifest *m)
+static void *do_run_tests_vg(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;
 {
        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) {
 
        list_head_init(list);
 
        list_for_each(&m->run_tests, i, list) {

-               run_tests.total_score++;
-               /* FIXME: timeout here */
-               cmdout = run_command(m, "valgrind -q %s", i->compiled);
+               run_tests_vg.total_score++;
+               cmdout = run_command(m, timeleft,
+                                    "valgrind -q %s", i->compiled);

                if (cmdout) {
                        res = talloc(list, struct run_tests_result);
                        res->file = i;
                if (cmdout) {
                        res = talloc(list, struct run_tests_result);
                        res->file = i;


@@ -52,9 +64,9 @@ static void *do_run_tests_vg(struct manifest *m)
        }
 
        list_for_each(&m->api_tests, i, list) {
        }
 
        list_for_each(&m->api_tests, i, list) {

-               run_tests.total_score++;
-               /* FIXME: timeout here */
-               cmdout = run_command(m, "valgrind -q %s", i->compiled);
+               run_tests_vg.total_score++;
+               cmdout = run_command(m, timeleft,
+                                    "valgrind -q %s", i->compiled);

                if (cmdout) {
                        res = talloc(list, struct run_tests_result);
                        res->file = i;
                if (cmdout) {
                        res = talloc(list, struct run_tests_result);
                        res->file = i;


@@ -68,6 +80,9 @@ static void *do_run_tests_vg(struct manifest *m)
                list = NULL;
        }
 
                list = NULL;
        }
 

+       if (chdir(olddir) != 0)
+               err(1, "Could not chdir to %s", olddir);
+

        return list;
 }
 
        return list;
 }
 


@@ -75,7 +90,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;
 {
        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--;
 
        list_for_each(list, i, list)
                score--;


@@ -95,6 +110,9 @@ static const char *describe_run_tests_vg(struct manifest *m,
        return descrip;
 }
 
        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;
 static void run_under_debugger_vg(struct manifest *m, void *check_result)
 {
        struct list_head *list = check_result;


@@ -107,11 +125,13 @@ static void run_under_debugger_vg(struct manifest *m, void *check_result)
        first = list_top(list, struct run_tests_result, list);
        command = talloc_asprintf(m, "valgrind --db-attach=yes %s",
                                  first->file->compiled);
        first = list_top(list, struct run_tests_result, list);
        command = talloc_asprintf(m, "valgrind --db-attach=yes %s",
                                  first->file->compiled);

-       system(command);
+       if (system(command))
+               doesnt_matter();

 }
 
 struct ccanlint run_tests_vg = {
 }
 
 struct ccanlint run_tests_vg = {

-       .name = "run and api tests under valgrind",
+       .key = "valgrind-tests",
+       .name = "Module's run and api tests succeed under valgrind",

        .score = score_run_tests_vg,
        .check = do_run_tests_vg,
        .describe = describe_run_tests_vg,
        .score = score_run_tests_vg,
        .check = do_run_tests_vg,
        .describe = describe_run_tests_vg,