ccanlint: allow _info file to specify tests not to bother with.

I also changed -x to be specified multiple times rather than using , separators.

diff --git a/ccan/tdb2/_info b/ccan/tdb2/_info
index 7533b0bd90bbb5ce5bee18688102e96a4284dd29..ecfcd233950e973e3cf07bcb370e44e00fb4bce8 100644 (file)
--- a/ccan/tdb2/_info
+++ b/ccan/tdb2/_info
@@ -64,6 +64,9 @@
  * Author: Rusty Russell
  *
  * Licence: LGPLv3 (or later)
  * Author: Rusty Russell
  *
  * Licence: LGPLv3 (or later)

+ *
+ * Fails:
+ *     valgrind-tests // hash needs --partial-loads-ok=yes.

  */
 int main(int argc, char *argv[])
 {
  */
 int main(int argc, char *argv[])
 {

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 179f270344cd00a4a8109e18384bb6d555bf5d21..17c9f45957ced713dc39b2e36f75cbcb04903865 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -36,19 +36,20 @@ static LIST_HEAD(compulsory_tests);
 static LIST_HEAD(normal_tests);
 static LIST_HEAD(finished_tests);
 bool safe_mode = false;
 static LIST_HEAD(normal_tests);
 static LIST_HEAD(finished_tests);
 bool safe_mode = false;

-static struct btree *exclude;
+static struct btree *cmdline_exclude;
+static struct btree *info_exclude;

 static unsigned int timeout;
 
 static void usage(const char *name)
 {
 static unsigned int timeout;
 
 static void usage(const char *name)
 {

-       fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <tests>] [-k <test>]*\n"
+       fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <test>]* [-k <test>]*\n"

                "   -v: verbose mode (can specify more than once)\n"
                "   -s: simply give one line summary\n"
                "   -d: use this directory instead of the current one\n"
                "   -n: do not compile anything\n"
                "   -l: list tests ccanlint performs\n"
                "   -k: keep results of this test (can be used multiple times)\n"
                "   -v: verbose mode (can specify more than once)\n"
                "   -s: simply give one line summary\n"
                "   -d: use this directory instead of the current one\n"
                "   -n: do not compile anything\n"
                "   -l: list tests ccanlint performs\n"
                "   -k: keep results of this test (can be used multiple times)\n"

-               "   -x: exclude tests (e.g. -x trailing_whitespace,valgrind)\n"
+               "   -x: exclude tests (can be used multiple times)\n"

                "   -t: ignore (terminate) tests that are slower than this\n",
                name);
        exit(1);
                "   -t: ignore (terminate) tests that are slower than this\n",
                name);
        exit(1);


@@ -82,8 +83,11 @@ bool ask(const char *question)
 
 static const char *should_skip(struct manifest *m, struct ccanlint *i)
 {
 
 static const char *should_skip(struct manifest *m, struct ccanlint *i)
 {

-       if (btree_lookup(exclude, i->key))
+       if (btree_lookup(cmdline_exclude, i->key))

                return "excluded on command line";
                return "excluded on command line";

+
+       if (btree_lookup(info_exclude, i->key))
+               return "excluded in _info file";

        
        if (i->skip_fail)
                return "dependency failed";
        
        if (i->skip_fail)
                return "dependency failed";


@@ -329,6 +333,27 @@ static void list_tests(void)
        exit(0);
 }
 
        exit(0);
 }
 

+static char *strip(const void *ctx, const char *line)
+{
+       line += strcspn(line, IDENT_CHARS "-");
+       return talloc_strndup(ctx, line, strspn(line, IDENT_CHARS "-"));
+}
+
+static void add_info_fails(struct ccan_file *info)
+{
+       struct doc_section *d;
+       unsigned int i;
+
+       list_for_each(get_ccan_file_docs(info), d, list) {
+               if (!streq(d->type, "fails"))
+                       continue;
+
+               for (i = 0; i < d->num_lines; i++)
+                       btree_insert(info_exclude, strip(info, d->lines[i]));
+               break;
+       }
+}
+

 int main(int argc, char *argv[])
 {
        int c;
 int main(int argc, char *argv[])
 {
        int c;


@@ -340,7 +365,8 @@ int main(int argc, char *argv[])
        
        init_tests();
 
        
        init_tests();
 

-       exclude = btree_new(btree_strcmp);
+       cmdline_exclude = btree_new(btree_strcmp);
+       info_exclude = btree_new(btree_strcmp);

 
        /* I'd love to use long options, but that's not standard. */
        /* FIXME: popt ccan package? */
 
        /* I'd love to use long options, but that's not standard. */
        /* FIXME: popt ccan package? */


@@ -370,12 +396,9 @@ int main(int argc, char *argv[])
                case 'k':
                        keep_test(optarg);
                        break;
                case 'k':
                        keep_test(optarg);
                        break;

-               case 'x': {
-                       char **exclude_strs = strsplit(NULL, optarg, ",", NULL);
-                       size_t i;
-                       for (i = 0; exclude_strs[i]; i++)
-                               btree_insert(exclude, exclude_strs[i]);
-               } break;
+               case 'x':
+                       btree_insert(cmdline_exclude, optarg);
+                       break;

                case 't':
                        timeout = atoi(optarg);
                        if (!timeout)
                case 't':
                        timeout = atoi(optarg);
                        if (!timeout)


@@ -414,6 +437,8 @@ int main(int argc, char *argv[])
                }
        }
 
                }
        }
 

+       add_info_fails(m->info_file);
+

        if (verbose)
                printf("\nNormal tests:\n");
        while ((i = get_next_test(&normal_tests)) != NULL)
        if (verbose)
                printf("\nNormal tests:\n");
        while ((i = get_next_test(&normal_tests)) != NULL)