tools: fastcheck adjust; 750ms works well for me.

[ccan] / tools / ccanlint / ccanlint.c

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 85f68a3d21a540c939dbe250831cbe717cef7a22..20c3b9bf0e64df23d4d1bd76c601122a0792f43b 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -37,16 +37,18 @@ static LIST_HEAD(normal_tests);
 static LIST_HEAD(finished_tests);
 bool safe_mode = false;
 static struct btree *exclude;
+static unsigned int timeout;
 
 static void usage(const char *name)
 {
-       fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-d <dirname>]\n"
+       fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t <ms>] [-d <dirname>] [-x <tests>]\n"
                "   -v: verbose mode\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"
-               "   -x: exclude tests (e.g. -x trailing_whitespace,valgrind)\n",
+               "   -x: exclude tests (e.g. -x trailing_whitespace,valgrind)\n"
+               "   -t: ignore (terminate) tests that are slower than this\n",
                name);
        exit(1);
 }
@@ -100,7 +102,7 @@ static bool run_test(struct ccanlint *i,
                     struct manifest *m)
 {
        void *result;
-       unsigned int this_score;
+       unsigned int this_score, timeleft;
        const struct dependent *d;
        const char *skip;
 
@@ -109,7 +111,9 @@ static bool run_test(struct ccanlint *i,
                d->dependent->num_depends--;
 
        skip = should_skip(m, i);
+
        if (skip) {
+       skip:
                if (verbose)
                        printf("  %s: skipped (%s)\n", i->name, skip);
 
@@ -126,7 +130,12 @@ static bool run_test(struct ccanlint *i,
                return true;
        }
 
-       result = i->check(m);
+       timeleft = timeout ? timeout : default_timeout_ms;
+       result = i->check(m, &timeleft);
+       if (timeout && timeleft == 0) {
+               skip = "timeout";
+               goto skip;
+       }
        if (!result) {
                if (verbose) {
                        printf("  %s: OK", i->name);
@@ -275,34 +284,26 @@ static void init_tests(void)
        }
 }
 
-static void print_test(const struct ccanlint *i)
+static void print_tests(struct list_head *tests, const char *type)
 {
-       int space = 25 - strlen(i->key);
-       
-       if (space >= 2) {
-               printf("   %s", i->key);
-               while (space--)
-                       putchar(' ');
-       } else {
-               printf("   %s  ", i->key);
+       struct ccanlint *i;
+
+       printf("%s tests:\n", type);
+       /* This makes them print in topological order. */
+       while ((i = get_next_test(tests)) != NULL) {
+               const struct dependent *d;
+               printf("   %-25s %s\n", i->key, i->name);
+               list_del(&i->list);
+               list_for_each(&i->dependencies, d, node)
+                       d->dependent->num_depends--;
        }
-       
-       printf("%s\n", i->name);
 }
 
 static void list_tests(void)
 {
-       const struct ccanlint *i;
-       
        init_tests();
-       
-       printf("Compulsory tests:\n");
-       list_for_each(&compulsory_tests, i, list)
-               print_test(i);
-       printf("Normal tests:\n");
-       list_for_each(&normal_tests, i, list)
-               print_test(i);
-       
+       print_tests(&compulsory_tests, "Compulsory");
+       print_tests(&normal_tests, "Normal");
        exit(0);
 }
 
@@ -319,7 +320,7 @@ int main(int argc, char *argv[])
 
        /* I'd love to use long options, but that's not standard. */
        /* FIXME: getopt_long ccan package? */
-       while ((c = getopt(argc, argv, "sd:vnlx:")) != -1) {
+       while ((c = getopt(argc, argv, "sd:vnlx:t:")) != -1) {
                switch (c) {
                case 'd':
                        dir = optarg;
@@ -344,6 +345,12 @@ int main(int argc, char *argv[])
                        for (i = 0; exclude_strs[i]; i++)
                                btree_insert(exclude, exclude_strs[i]);
                } break;
+               case 't':
+                       timeout = atoi(optarg);
+                       if (!timeout)
+                               errx(1, "Invalid timeout %s: 1 ms minumum",
+                                    optarg);
+                       break;
                default:
                        usage(argv[0]);
                }