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

diff --git a/Makefile b/Makefile
index 0f1d942177b0cb83a4d3a354c1a2c2837ad800b4..4bdbf89c7fbb10422a1a2fb9b12d6a9fac58237e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,45 @@ ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(ALL))
 # Not all modules have tests.
 ALL_TESTS=$(patsubst ccan/%/test/, %, $(foreach dir, $(ALL), $(wildcard ccan/$(dir)/test/)))
 
 # Not all modules have tests.
 ALL_TESTS=$(patsubst ccan/%/test/, %, $(foreach dir, $(ALL), $(wildcard ccan/$(dir)/test/)))
 

+# Here's my rough logarithmic timeout graph for my laptop:
+#
+# 302                                                  -     
+#    |                                                  / --*  
+#    |                                                 /       
+#    |                                                 /       
+#    |                                                /        
+#    |Execution Time, seconds                        /        
+#    |                                               /         
+#    |                                          ---//          
+#    |                                         /               
+#    |                                       //                
+#    |                    ---\            ---                  
+#    |                 ---    \\    ------                     
+#    |-----------------         \---                           
+# 19 +------------------------------------------------------+--
+#    0           Timeout (ms, logarithmic)               262144
+#
+# 140
+#    |                                                         
+#    |------------                                             
+#    |            ---                                          
+#    |               ---------                                 
+#    |                        -------                          
+#    |                               --\                       
+#    |                                  \\-                    
+#    | Tests skipped                       --\                 
+#    |                                        \                
+#    |                                         \\              
+#    |                                           \\\           
+#    |                                              \          
+#    |                                               \----     
+#  --+0---------------------------------------------------==+--
+#    0           Timeout (ms, logarithmic)               262144
+#
+# On my laptop, this runs 574 tests in 40 seconds, vs. a full check which
+# runs 676 tests in 260 seconds.
+FASTTIMEOUT=750
+

 default: libccan.a
 
 include Makefile-ccan
 default: libccan.a
 
 include Makefile-ccan


@@ -39,14 +78,14 @@ check-%: tools/ccanlint/ccanlint
        @tools/ccanlint/ccanlint -d ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint
        @tools/ccanlint/ccanlint -d ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint

-       @tools/ccanlint/ccanlint -t -d ccan/$*
+       @tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -d ccan/$*

 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
        @tools/ccanlint/ccanlint -s -d ccan/$*
 
 summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)
 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
        @tools/ccanlint/ccanlint -s -d ccan/$*
 
 summary-fastcheck-%: tools/ccanlint/ccanlint $(OBJFILES)

-       @tools/ccanlint/ccanlint -t -s -d ccan/$*
+       @tools/ccanlint/ccanlint -t $(FASTTIMEOUT) -s -d ccan/$*

 
 ccan/%/info: ccan/%/_info
        $(CC) $(CFLAGS) -o $@ -x c $<
 
 ccan/%/info: ccan/%/_info
        $(CC) $(CFLAGS) -o $@ -x c $<

diff --git a/Makefile-ccan b/Makefile-ccan
index 59d540b4a0d6b2a5d80ad7962049d54cb6774636..9b248a53fc27bb7392140a1fd1910203dbb392a4 100644 (file)
--- a/Makefile-ccan
+++ b/Makefile-ccan
@@ -2,8 +2,8 @@
 # For simple projects you could just do:
 #      SRCFILES += $(wildcard ccan/*/*.c)
 
 # For simple projects you could just do:
 #      SRCFILES += $(wildcard ccan/*/*.c)
 

-#CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I. $(DEPGEN)
-CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Werror -I. $(DEPGEN)
+CFLAGS=-g -O3 -Wall -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I. $(DEPGEN)
+#CFLAGS=-g -Wall -Wstrict-prototypes -Wold-style-definition -Werror -I. $(DEPGEN)

 
 default: libccan.a
 
 
 default: libccan.a
 

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index a65c64106d2799fbfb7ba5deb8fffccf2acd7307..20c3b9bf0e64df23d4d1bd76c601122a0792f43b 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -37,18 +37,18 @@ static LIST_HEAD(normal_tests);
 static LIST_HEAD(finished_tests);
 bool safe_mode = false;
 static struct btree *exclude;
 static LIST_HEAD(finished_tests);
 bool safe_mode = false;
 static struct btree *exclude;

-static bool fastmode = false;
+static unsigned int timeout;

 
 static void usage(const char *name)
 {
 
 static void usage(const char *name)
 {

-       fprintf(stderr, "Usage: %s [-s] [-n] [-v] [-t] [-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"
                "   -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"

-               "   -t: ignore (terminate) tests that are slow\n",
+               "   -t: ignore (terminate) tests that are slower than this\n",

                name);
        exit(1);
 }
                name);
        exit(1);
 }


@@ -130,9 +130,9 @@ static bool run_test(struct ccanlint *i,
                return true;
        }
 
                return true;
        }
 

-       timeleft = fastmode ? 1000 : default_timeout_ms;
+       timeleft = timeout ? timeout : default_timeout_ms;

        result = i->check(m, &timeleft);
        result = i->check(m, &timeleft);

-       if (fastmode && timeleft == 0) {
+       if (timeout && timeleft == 0) {

                skip = "timeout";
                goto skip;
        }
                skip = "timeout";
                goto skip;
        }


@@ -320,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? */
 
        /* I'd love to use long options, but that's not standard. */
        /* FIXME: getopt_long ccan package? */

-       while ((c = getopt(argc, argv, "sd:vnlx:t")) != -1) {
+       while ((c = getopt(argc, argv, "sd:vnlx:t:")) != -1) {

                switch (c) {
                case 'd':
                        dir = optarg;
                switch (c) {
                case 'd':
                        dir = optarg;


@@ -346,7 +346,10 @@ int main(int argc, char *argv[])
                                btree_insert(exclude, exclude_strs[i]);
                } break;
                case 't':
                                btree_insert(exclude, exclude_strs[i]);
                } break;
                case 't':

-                       fastmode = true;
+                       timeout = atoi(optarg);
+                       if (!timeout)
+                               errx(1, "Invalid timeout %s: 1 ms minumum",
+                                    optarg);

                        break;
                default:
                        usage(argv[0]);
                        break;
                default:
                        usage(argv[0]);