]> git.ozlabs.org Git - ccan/blobdiff - tools/configurator/configurator.c
configurator: Fix unused parameters
[ccan] / tools / configurator / configurator.c
index e2c13b7e57161d004832e80af0a78b9a967f48d9..67dadc61eb8a550cea7c3a86f491458a64647e81 100644 (file)
@@ -53,124 +53,199 @@ struct test {
        const char *name;
        enum test_style style;
        const char *depends;
+       const char *link;
        const char *fragment;
+       const char *flags;
+       const char *overrides; /* On success, force this to '1' */
        bool done;
        bool answer;
 };
 
 static struct test tests[] = {
-       { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL,
+       { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
          "#include <sys/types.h>\n"
-         "int main(int argc, char *argv[]) {\n"
+         "int main(void) {\n"
          "     return sizeof(off_t) == 4 ? 0 : 1;\n"
          "}\n" },
-       { "HAVE_ALIGNOF", INSIDE_MAIN, NULL,
+       { "HAVE_ALIGNOF", INSIDE_MAIN, NULL, NULL,
          "return __alignof__(double) > 0 ? 0 : 1;" },
-       { "HAVE_ASPRINTF", DEFINES_FUNC, NULL,
+       { "HAVE_ASPRINTF", DEFINES_FUNC, NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
          "#define _GNU_SOURCE\n"
+         "#endif\n"
          "#include <stdio.h>\n"
          "static char *func(int x) {"
          "     char *p;\n"
          "     if (asprintf(&p, \"%u\", x) == -1) p = NULL;"
          "     return p;\n"
          "}" },
-       { "HAVE_ATTRIBUTE_COLD", DEFINES_FUNC, NULL,
+       { "HAVE_ATTRIBUTE_COLD", DEFINES_FUNC, NULL, NULL,
          "static int __attribute__((cold)) func(int x) { return x; }" },
-       { "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL,
+       { "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL, NULL,
          "static int __attribute__((const)) func(int x) { return x; }" },
-       { "HAVE_ATTRIBUTE_MAY_ALIAS", OUTSIDE_MAIN, NULL,
+       { "HAVE_ATTRIBUTE_PURE", DEFINES_FUNC, NULL, NULL,
+         "static int __attribute__((pure)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_MAY_ALIAS", OUTSIDE_MAIN, NULL, NULL,
          "typedef short __attribute__((__may_alias__)) short_a;" },
-       { "HAVE_ATTRIBUTE_NORETURN", DEFINES_FUNC, NULL,
+       { "HAVE_ATTRIBUTE_NORETURN", DEFINES_FUNC, NULL, NULL,
          "#include <stdlib.h>\n"
          "static void __attribute__((noreturn)) func(int x) { exit(x); }" },
-       { "HAVE_ATTRIBUTE_PRINTF", DEFINES_FUNC, NULL,
-         "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { }" },
-       { "HAVE_ATTRIBUTE_UNUSED", OUTSIDE_MAIN, NULL,
+       { "HAVE_ATTRIBUTE_PRINTF", DEFINES_FUNC, NULL, NULL,
+         "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { (void)fmt; }" },
+       { "HAVE_ATTRIBUTE_UNUSED", OUTSIDE_MAIN, NULL, NULL,
          "static int __attribute__((unused)) func(int x) { return x; }" },
-       { "HAVE_ATTRIBUTE_USED", OUTSIDE_MAIN, NULL,
+       { "HAVE_ATTRIBUTE_USED", OUTSIDE_MAIN, NULL, NULL,
          "static int __attribute__((used)) func(int x) { return x; }" },
-       { "HAVE_BACKTRACE", DEFINES_FUNC, NULL,
+       { "HAVE_BACKTRACE", DEFINES_FUNC, NULL, NULL,
          "#include <execinfo.h>\n"
          "static int func(int x) {"
          "     void *bt[10];\n"
          "     return backtrace(bt, 10) < x;\n"
          "}" },
-       { "HAVE_BIG_ENDIAN", INSIDE_MAIN|EXECUTE, NULL,
+       { "HAVE_BIG_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, NULL,
          "union { int i; char c[sizeof(int)]; } u;\n"
          "u.i = 0x01020304;\n"
          "return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;" },
-       { "HAVE_BSWAP_64", DEFINES_FUNC, "HAVE_BYTESWAP_H",
+       { "HAVE_BSWAP_64", DEFINES_FUNC, "HAVE_BYTESWAP_H", NULL,
          "#include <byteswap.h>\n"
          "static int func(int x) { return bswap_64(x); }" },
-       { "HAVE_BUILTIN_CHOOSE_EXPR", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_CHOOSE_EXPR", INSIDE_MAIN, NULL, NULL,
          "return __builtin_choose_expr(1, 0, \"garbage\");" },
-       { "HAVE_BUILTIN_CLZ", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_CLZ", INSIDE_MAIN, NULL, NULL,
          "return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;" },
-       { "HAVE_BUILTIN_CLZL", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_CLZL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" },
-       { "HAVE_BUILTIN_CLZLL", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_CLZLL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
-       { "HAVE_BUILTIN_CONSTANT_P", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_CTZ", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctz(1 << (sizeof(int)*8 - 1)) == (sizeof(int)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZL", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctzl(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZLL", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctzll(1ULL << (sizeof(long long)*8 - 1)) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CONSTANT_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_constant_p(1) ? 0 : 1;" },
-       { "HAVE_BUILTIN_EXPECT", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_EXPECT", INSIDE_MAIN, NULL, NULL,
          "return __builtin_expect(argc == 1, 1) ? 0 : 1;" },
-       { "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_FFS", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ffs(0) == 0 ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_ffsl(0L) == 0 ? 0 : 1;" },
-       { "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_ffsll(0LL) == 0 ? 0 : 1;" },
-       { "HAVE_BUILTIN_POPCOUNTL", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_POPCOUNTL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_popcountl(255L) == 8 ? 0 : 1;" },
-       { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL,
+       { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" },
-       { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL,
+       { "HAVE_ICCARM_INTRINSICS", DEFINES_FUNC, NULL, NULL,
+         "#include <intrinsics.h>\n"
+         "int func(int v) {\n"
+         "     return __CLZ(__RBIT(v));\n"
+         "}" },
+       { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL, NULL,
          "#include <byteswap.h>\n" },
-       { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL,
+       { "HAVE_CLOCK_GETTIME",
+         DEFINES_FUNC, "HAVE_STRUCT_TIMESPEC", NULL,
+         "#include <time.h>\n"
+         "static struct timespec func(void) {\n"
+         "     struct timespec ts;\n"
+         "     clock_gettime(CLOCK_REALTIME, &ts);\n"
+         "     return ts;\n"
+         "}\n" },
+       { "HAVE_CLOCK_GETTIME_IN_LIBRT",
+         DEFINES_FUNC,
+         "HAVE_STRUCT_TIMESPEC !HAVE_CLOCK_GETTIME",
+         "-lrt",
+         "#include <time.h>\n"
+         "static struct timespec func(void) {\n"
+         "     struct timespec ts;\n"
+         "     clock_gettime(CLOCK_REALTIME, &ts);\n"
+         "     return ts;\n"
+         "}\n",
+         /* This means HAVE_CLOCK_GETTIME, too */
+         "HAVE_CLOCK_GETTIME" },
+       { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL,
          "int *foo = (int[]) { 1, 2, 3, 4 };\n"
          "return foo[0] ? 0 : 1;" },
+       { "HAVE_FCHDIR", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+         "#include <sys/types.h>\n"
+         "#include <sys/stat.h>\n"
+         "#include <fcntl.h>\n"
+         "#include <unistd.h>\n"
+         "int main(void) {\n"
+         "     int fd = open(\"..\", O_RDONLY);\n"
+         "     return fchdir(fd) == 0 ? 0 : 1;\n"
+         "}\n" },
+       { "HAVE_ERR_H", DEFINES_FUNC, NULL, NULL,
+         "#include <err.h>\n"
+         "static void func(int arg) {\n"
+         "     if (arg == 0)\n"
+         "             err(1, \"err %u\", arg);\n"
+         "     if (arg == 1)\n"
+         "             errx(1, \"err %u\", arg);\n"
+         "     if (arg == 3)\n"
+         "             warn(\"warn %u\", arg);\n"
+         "     if (arg == 4)\n"
+         "             warnx(\"warn %u\", arg);\n"
+         "}\n" },
        { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
-         "HAVE_32BIT_OFF_T",
+         "HAVE_32BIT_OFF_T", NULL,
          "#define _FILE_OFFSET_BITS 64\n"
          "#include <sys/types.h>\n"
-         "int main(int argc, char *argv[]) {\n"
+         "int main(void) {\n"
          "     return sizeof(off_t) == 8 ? 0 : 1;\n"
          "}\n" },
-       { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
+       { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL, NULL,
          "for (int i = 0; i < argc; i++) { return 0; };\n"
          "return 1;" },
-       { "HAVE_FLEXIBLE_ARRAY_MEMBER", OUTSIDE_MAIN, NULL,
+       { "HAVE_FLEXIBLE_ARRAY_MEMBER", OUTSIDE_MAIN, NULL, NULL,
          "struct foo { unsigned int x; int arr[]; };" },
-       { "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL,
+       { "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL, NULL,
          "#include <unistd.h>\n"
          "static int func(void) { return getpagesize(); }" },
-       { "HAVE_ISBLANK", DEFINES_FUNC, NULL,
+       { "HAVE_ISBLANK", DEFINES_FUNC, NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
          "#define _GNU_SOURCE\n"
+         "#endif\n"
          "#include <ctype.h>\n"
          "static int func(void) { return isblank(' '); }" },
-       { "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL,
+       { "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, NULL,
          "union { int i; char c[sizeof(int)]; } u;\n"
          "u.i = 0x01020304;\n"
          "return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;" },
-       { "HAVE_MEMMEM", DEFINES_FUNC, NULL,
+       { "HAVE_MEMMEM", DEFINES_FUNC, NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
          "#define _GNU_SOURCE\n"
+         "#endif\n"
          "#include <string.h>\n"
          "static void *func(void *h, size_t hl, void *n, size_t nl) {\n"
          "return memmem(h, hl, n, nl);"
          "}\n", },
-       { "HAVE_MMAP", DEFINES_FUNC, NULL,
+       { "HAVE_MEMRCHR", DEFINES_FUNC, NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\n"
+         "#include <string.h>\n"
+         "static void *func(void *s, int c, size_t n) {\n"
+         "return memrchr(s, c, n);"
+         "}\n", },
+       { "HAVE_MMAP", DEFINES_FUNC, NULL, NULL,
          "#include <sys/mman.h>\n"
          "static void *func(int fd) {\n"
          "     return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
          "}" },
-       { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL,
+       { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <sys/stat.h>\n"
-         "#include <sys/fcntl.h>\n"
+         "#include <fcntl.h>\n"
          "int main(void) {\n"
          "     return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n"
          "}\n" },
        { "HAVE_QSORT_R_PRIVATE_LAST",
-         DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL,
-         "#define _GNU_SOURCE 1\n"
+         DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\n"
          "#include <stdlib.h>\n"
          "static int cmp(const void *lp, const void *rp, void *priv) {\n"
          " *(unsigned int *)priv = 1;\n"
@@ -181,14 +256,21 @@ static struct test tests[] = {
          " qsort_r(array, 3, sizeof(int), cmp, &called);\n"
          " return called && array[0] == 2 && array[1] == 5 && array[2] == 9 ? 0 : 1;\n"
          "}\n" },
+       { "HAVE_STRUCT_TIMESPEC",
+         DEFINES_FUNC, NULL, NULL,
+         "#include <time.h>\n"
+         "static void func(void) {\n"
+         "     struct timespec ts;\n"
+         "     ts.tv_sec = ts.tv_nsec = 1;\n"
+         "}\n" },
        { "HAVE_SECTION_START_STOP",
-         DEFINES_FUNC, NULL,
+         DEFINES_FUNC, NULL, NULL,
          "static void *__attribute__((__section__(\"mysec\"))) p = &p;\n"
          "static int func(void) {\n"
          "     extern void *__start_mysec[], *__stop_mysec[];\n"
          "     return __stop_mysec - __start_mysec;\n"
          "}\n" },
-       { "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL,
+       { "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
          "static long nest(const void *base, unsigned int i)\n"
          "{\n"
          "     if (i == 0)\n"
@@ -196,25 +278,93 @@ static struct test tests[] = {
          "     return nest(base, i-1);\n"
          "}\n"
          "int main(int argc, char *argv[]) {\n"
-         "     return (nest(&argc, argc) > 0) ? 0 : 1\n;"
+         "     (void)argv;\n"
+         "     return (nest(&argc, argc) > 0) ? 0 : 1;\n"
          "}\n" },
-       { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
+       { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL, NULL,
          "return ({ int x = argc; x == argc ? 0 : 1; });" },
-       { "HAVE_TYPEOF", INSIDE_MAIN, NULL,
+       { "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, NULL, /* Solaris needs this for FIONREAD */
+         "#include <sys/filio.h>\n" },
+       { "HAVE_SYS_TERMIOS_H", OUTSIDE_MAIN, NULL, NULL,
+         "#include <sys/termios.h>\n" },
+       { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
-       { "HAVE_UTIME", DEFINES_FUNC, NULL,
+       { "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
+         "#include <string.h>\n"
+         "int main(int argc, char *argv[]) {\n"
+         "     (void)argc;\n"
+         "     char pad[sizeof(int *) * 1];\n"
+         "     strncpy(pad, argv[0], sizeof(pad));\n"
+         "     int *x = (int *)pad, *y = (int *)(pad + 1);\n"
+         "     return *x == *y;\n"
+         "}\n" },
+       { "HAVE_UTIME", DEFINES_FUNC, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <utime.h>\n"
          "static int func(const char *filename) {\n"
          "     struct utimbuf times = { 0 };\n"
          "     return utime(filename, &times);\n"
          "}" },
-       { "HAVE_WARN_UNUSED_RESULT", DEFINES_FUNC, NULL,
+       { "HAVE_WARN_UNUSED_RESULT", DEFINES_FUNC, NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <utime.h>\n"
          "static __attribute__((warn_unused_result)) int func(int i) {\n"
          "     return i + 1;\n"
          "}" },
+       { "HAVE_OPENMP", INSIDE_MAIN, NULL, NULL,
+         "int i;\n"
+         "#pragma omp parallel for\n"
+         "for(i = 0; i < 0; i++) {};\n"
+         "return 0;\n",
+         "-Werror -fopenmp" },
+       { "HAVE_VALGRIND_MEMCHECK_H", OUTSIDE_MAIN, NULL, NULL,
+         "#include <valgrind/memcheck.h>\n" },
+       { "HAVE_UCONTEXT", DEFINES_EVERYTHING|EXECUTE,
+         NULL, NULL,
+         "#include <ucontext.h>\n"
+         "static int x = 0;\n"
+         "static char stack[2048];\n"
+         "static ucontext_t a, b;\n"
+         "static void fn(void) {\n"
+         "     x |= 2;\n"
+         "     setcontext(&b);\n"
+         "     x |= 4;\n"
+         "}\n"
+         "int main(void) {\n"
+         "     x |= 1;\n"
+         "     getcontext(&a);\n"
+         "     a.uc_stack.ss_sp = stack;\n"
+         "     a.uc_stack.ss_size = sizeof(stack);\n"
+         "     makecontext(&a, fn, 0);\n"
+         "     swapcontext(&b, &a);\n"
+         "     return (x == 3) ? 0 : 1;\n"
+         "}\n"
+       },
+       { "HAVE_POINTER_SAFE_MAKECONTEXT", DEFINES_EVERYTHING|EXECUTE,
+         "HAVE_UCONTEXT", NULL,
+         "#include <stddef.h>\n"
+         "#include <ucontext.h>\n"
+         "static int worked = 0;\n"
+         "static char stack[1024];\n"
+         "static ucontext_t a, b;\n"
+         "static void fn(void *p, void *q) {\n"
+         "     void *cp = &worked;\n"
+         "     void *cq = (void *)(~((ptrdiff_t)cp));\n"
+         "     if ((p == cp) && (q == cq))\n"
+         "             worked = 1;\n"
+         "     setcontext(&b);\n"
+         "}\n"
+         "int main(void) {\n"
+         "     void *ap = &worked;\n"
+         "     void *aq = (void *)(~((ptrdiff_t)ap));\n"
+         "     getcontext(&a);\n"
+         "     a.uc_stack.ss_sp = stack;\n"
+         "     a.uc_stack.ss_size = sizeof(stack);\n"
+         "     makecontext(&a, (void (*)(void))fn, 2, ap, aq);\n"
+         "     swapcontext(&b, &a);\n"
+         "     return worked ? 0 : 1;\n"
+         "}\n"
+       },
 };
 
 static char *grab_fd(int fd)
@@ -291,7 +441,8 @@ static char *connect_args(const char *argv[], const char *extra)
        for (i = 1; argv[i]; i++) {
                strcpy(ret + len, argv[i]);
                len += strlen(argv[i]);
-               ret[len++] = ' ';
+               if (argv[i+1])
+                       ret[len++] = ' ';
        }
        strcpy(ret + len, extra);
        return ret;
@@ -309,24 +460,53 @@ static struct test *find_test(const char *name)
 }
 
 #define PRE_BOILERPLATE "/* Test program generated by configurator. */\n"
-#define MAIN_START_BOILERPLATE "int main(int argc, char *argv[]) {\n"
+#define MAIN_START_BOILERPLATE \
+       "int main(int argc, char *argv[]) {\n" \
+       "       (void)argc;\n" \
+       "       (void)argv;\n"
 #define USE_FUNC_BOILERPLATE "(void)func;\n"
 #define MAIN_BODY_BOILERPLATE "return 0;\n"
 #define MAIN_END_BOILERPLATE "}\n"
 
 static bool run_test(const char *cmd, struct test *test)
 {
-       char *output;
+       char *output, *newcmd;
        FILE *outf;
        int status;
 
        if (test->done)
                return test->answer;
 
-       if (test->depends && !run_test(cmd, find_test(test->depends))) {
-               test->answer = false;
-               test->done = true;
-               return test->answer;
+       if (test->depends) {
+               size_t len;
+               const char *deps = test->depends;
+               char *dep;
+
+               /* Space-separated dependencies, could be ! for inverse. */
+               while ((len = strcspn(deps, " "))) {
+                       bool positive = true;
+                       if (deps[len]) {
+                               dep = strdup(deps);
+                               dep[len] = '\0';
+                       } else {
+                               dep = (char *)deps;
+                       }
+
+                       if (dep[0] == '!') {
+                               dep++;
+                               positive = false;
+                       }
+                       if (run_test(cmd, find_test(dep)) != positive) {
+                               test->answer = false;
+                               test->done = true;
+                               return test->answer;
+                       }
+                       if (deps[len])
+                               free(dep);
+
+                       deps += len;
+                       deps += strspn(deps, " ");
+               }
        }
 
        outf = fopen(INPUT_FILE, "w");
@@ -363,9 +543,33 @@ static bool run_test(const char *cmd, struct test *test)
        fclose(outf);
 
        if (verbose > 1)
-               if (system("cat " INPUT_FILE) == -1);
+               if (system("cat " INPUT_FILE) == -1)
+                       ;
+
+       newcmd = strdup(cmd);
+
+       if (test->flags) {
+               newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
+                               + strlen(test->flags) + 1);
+               strcat(newcmd, " ");
+               strcat(newcmd, test->flags);
+               if (verbose > 1)
+                       printf("Extra flags line: %s", newcmd);
+       }
+
+       if (test->link) {
+               newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
+                               + strlen(test->link) + 1);
+               strcat(newcmd, " ");
+               strcat(newcmd, test->link);
+               if (verbose > 1)
+                       printf("Extra link line: %s", newcmd);
+       }
+
+       output = run(newcmd, &status);
+
+       free(newcmd);
 
-       output = run(cmd, &status);
        if (status != 0 || strstr(output, "warning")) {
                if (verbose)
                        printf("Compile %s for %s, status %i: %s\n",
@@ -392,6 +596,12 @@ static bool run_test(const char *cmd, struct test *test)
                test->answer = (status == 0);
        }
        test->done = true;
+
+       if (test->answer && test->overrides) {
+               struct test *override = find_test(test->overrides);
+               override->done = true;
+               override->answer = true;
+       }
        return test->answer;
 }
 
@@ -424,14 +634,14 @@ int main(int argc, const char *argv[])
        if (argc == 1)
                argv = default_args;
 
-       cmd = connect_args(argv, "-o " OUTPUT_FILE " " INPUT_FILE);
+       cmd = connect_args(argv, " -o " OUTPUT_FILE " " INPUT_FILE);
        for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
                run_test(cmd, &tests[i]);
+       free(cmd);
 
        unlink(OUTPUT_FILE);
        unlink(INPUT_FILE);
 
-       cmd[strlen(cmd) - strlen(" -o " OUTPUT_FILE " " INPUT_FILE)] = '\0';
        printf("/* Generated by CCAN configurator */\n"
               "#ifndef CCAN_CONFIG_H\n"
               "#define CCAN_CONFIG_H\n");
@@ -439,7 +649,11 @@ int main(int argc, const char *argv[])
        printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n");
        printf("#endif\n");
        printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
-       printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd + strlen(argv[1]) + 1);
+       cmd = connect_args(argv+1, "");
+       printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd);
+       free(cmd);
+       /* This one implies "#include <ccan/..." works, eg. for tdb2.h */
+       printf("#define HAVE_CCAN 1\n");
        for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
                printf("#define %s %u\n", tests[i].name, tests[i].answer);
        printf("#endif /* CCAN_CONFIG_H */\n");