X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=dae15446e67417ef8f02d3d07b259dbe33925963;hp=ff9f64904bb06a7759c7c453fbf53a3dae47f5e8;hb=1239aa28828e86658f003ce4ef5a5fa023c42711;hpb=8502a66a5ba8916758c67ea5b0b404386c34da24 diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c index ff9f6490..dae15446 100644 --- a/tools/configurator/configurator.c +++ b/tools/configurator/configurator.c @@ -32,6 +32,7 @@ #include #include #include +#include #ifdef _MSC_VER #define popen _popen @@ -65,19 +66,30 @@ static const char *progname = ""; static int verbose; - -enum test_style { - OUTSIDE_MAIN = 0x1, - DEFINES_FUNC = 0x2, - INSIDE_MAIN = 0x4, - DEFINES_EVERYTHING = 0x8, - MAY_NOT_COMPILE = 0x10, - EXECUTE = 0x8000 -}; +static bool like_a_libtool = false; struct test { const char *name; - enum test_style style; + /* + * Template style flags (pick one): + * OUTSIDE_MAIN: + * - put a simple boilerplate main below it. + * DEFINES_FUNC: + * - defines a static function called func; adds ref to avoid warnings + * INSIDE_MAIN: + * - put this inside main(). + * DEFINES_EVERYTHING: + * - don't add any boilerplate at all. + * + * Execution flags: + * EXECUTE: + * - a runtime test; must compile, exit 0 means flag is set. + * MAY_NOT_COMPILE: + * - Only useful with EXECUTE: don't get upset if it doesn't compile. + * : + * - a compile test, if it compiles must run and exit 0. + */ + const char *style; const char *depends; const char *link; const char *fragment; @@ -88,90 +100,95 @@ struct test { }; static struct test tests[] = { - { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL, + { "HAVE_32BIT_OFF_T", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#include \n" "int main(void) {\n" " return sizeof(off_t) == 4 ? 0 : 1;\n" "}\n" }, - { "HAVE_ALIGNOF", INSIDE_MAIN, NULL, NULL, + { "HAVE_ALIGNOF", "INSIDE_MAIN", NULL, NULL, "return __alignof__(double) > 0 ? 0 : 1;" }, - { "HAVE_ASPRINTF", DEFINES_FUNC, NULL, NULL, + { "HAVE_ASPRINTF", "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" "#include \n" "static char *func(int x) {" " char *p;\n" - " if (asprintf(&p, \"%u\", x) == -1) p = NULL;" + " if (asprintf(&p, \"%u\", x) == -1) \n" + " p = NULL;\n" " return p;\n" "}" }, - { "HAVE_ATTRIBUTE_COLD", DEFINES_FUNC, NULL, NULL, + { "HAVE_ATTRIBUTE_COLD", "DEFINES_FUNC", NULL, NULL, "static int __attribute__((cold)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL, NULL, + { "HAVE_ATTRIBUTE_CONST", "DEFINES_FUNC", NULL, NULL, "static int __attribute__((const)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_PURE", DEFINES_FUNC, NULL, 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, + { "HAVE_ATTRIBUTE_MAY_ALIAS", "OUTSIDE_MAIN", NULL, NULL, "typedef short __attribute__((__may_alias__)) short_a;" }, - { "HAVE_ATTRIBUTE_NORETURN", DEFINES_FUNC, NULL, NULL, + { "HAVE_ATTRIBUTE_NORETURN", "DEFINES_FUNC", NULL, NULL, "#include \n" "static void __attribute__((noreturn)) func(int x) { exit(x); }" }, - { "HAVE_ATTRIBUTE_PRINTF", DEFINES_FUNC, NULL, 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, + { "HAVE_ATTRIBUTE_UNUSED", "OUTSIDE_MAIN", NULL, NULL, "static int __attribute__((unused)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_USED", OUTSIDE_MAIN, NULL, NULL, + { "HAVE_ATTRIBUTE_USED", "OUTSIDE_MAIN", NULL, NULL, "static int __attribute__((used)) func(int x) { return x; }" }, - { "HAVE_BACKTRACE", DEFINES_FUNC, NULL, NULL, + { "HAVE_BACKTRACE", "DEFINES_FUNC", NULL, NULL, "#include \n" "static int func(int x) {" " void *bt[10];\n" " return backtrace(bt, 10) < x;\n" "}" }, - { "HAVE_BIG_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, 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", NULL, + { "HAVE_BSWAP_64", "DEFINES_FUNC", "HAVE_BYTESWAP_H", NULL, "#include \n" "static int func(int x) { return bswap_64(x); }" }, - { "HAVE_BUILTIN_CHOOSE_EXPR", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_CHOOSE_EXPR", "INSIDE_MAIN", NULL, NULL, "return __builtin_choose_expr(1, 0, \"garbage\");" }, - { "HAVE_BUILTIN_CLZ", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_CLZ", "INSIDE_MAIN", NULL, NULL, "return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CLZL", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_CLZL", "INSIDE_MAIN", NULL, NULL, "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CLZLL", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_CLZLL", "INSIDE_MAIN", NULL, NULL, "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CTZ", INSIDE_MAIN, NULL, 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, + { "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, + { "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, + { "HAVE_BUILTIN_CONSTANT_P", "INSIDE_MAIN", NULL, NULL, "return __builtin_constant_p(1) ? 0 : 1;" }, - { "HAVE_BUILTIN_EXPECT", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_EXPECT", "INSIDE_MAIN", NULL, NULL, "return __builtin_expect(argc == 1, 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_FFS", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_FFS", "INSIDE_MAIN", NULL, NULL, "return __builtin_ffs(0) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_FFSL", "INSIDE_MAIN", NULL, NULL, "return __builtin_ffsl(0L) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_FFSLL", "INSIDE_MAIN", NULL, NULL, "return __builtin_ffsll(0LL) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNTL", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_POPCOUNT", "INSIDE_MAIN", NULL, NULL, + "return __builtin_popcount(255) == 8 ? 0 : 1;" }, + { "HAVE_BUILTIN_POPCOUNTL", "INSIDE_MAIN", NULL, NULL, "return __builtin_popcountl(255L) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL, NULL, + { "HAVE_BUILTIN_POPCOUNTLL", "INSIDE_MAIN", NULL, NULL, + "return __builtin_popcountll(255LL) == 8 ? 0 : 1;" }, + { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", "INSIDE_MAIN", NULL, NULL, "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" }, - { "HAVE_ICCARM_INTRINSICS", DEFINES_FUNC, NULL, NULL, + { "HAVE_ICCARM_INTRINSICS", "DEFINES_FUNC", NULL, NULL, "#include \n" "int func(int v) {\n" " return __CLZ(__RBIT(v));\n" "}" }, - { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL, NULL, + { "HAVE_BYTESWAP_H", "OUTSIDE_MAIN", NULL, NULL, "#include \n" }, { "HAVE_CLOCK_GETTIME", - DEFINES_FUNC, "HAVE_STRUCT_TIMESPEC", NULL, + "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC", NULL, "#include \n" "static struct timespec func(void) {\n" " struct timespec ts;\n" @@ -179,7 +196,7 @@ static struct test tests[] = { " return ts;\n" "}\n" }, { "HAVE_CLOCK_GETTIME_IN_LIBRT", - DEFINES_FUNC, + "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC !HAVE_CLOCK_GETTIME", "-lrt", "#include \n" @@ -190,10 +207,10 @@ static struct test tests[] = { "}\n", /* This means HAVE_CLOCK_GETTIME, too */ "HAVE_CLOCK_GETTIME" }, - { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL, + { "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|MAY_NOT_COMPILE, NULL, NULL, + { "HAVE_FCHDIR", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#include \n" "#include \n" "#include \n" @@ -202,7 +219,7 @@ static struct test tests[] = { " int fd = open(\"..\", O_RDONLY);\n" " return fchdir(fd) == 0 ? 0 : 1;\n" "}\n" }, - { "HAVE_ERR_H", DEFINES_FUNC, NULL, NULL, + { "HAVE_ERR_H", "DEFINES_FUNC", NULL, NULL, "#include \n" "static void func(int arg) {\n" " if (arg == 0)\n" @@ -214,33 +231,33 @@ static struct test tests[] = { " if (arg == 4)\n" " warnx(\"warn %u\", arg);\n" "}\n" }, - { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, + { "HAVE_FILE_OFFSET_BITS", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", "HAVE_32BIT_OFF_T", NULL, "#define _FILE_OFFSET_BITS 64\n" "#include \n" "int main(void) {\n" " return sizeof(off_t) == 8 ? 0 : 1;\n" "}\n" }, - { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL, NULL, + { "HAVE_FOR_LOOP_DECLARATION", "INSIDE_MAIN", NULL, NULL, "int ret = 1;\n" "for (int i = 0; i < argc; i++) { ret = 0; };\n" "return ret;" }, - { "HAVE_FLEXIBLE_ARRAY_MEMBER", OUTSIDE_MAIN, NULL, NULL, + { "HAVE_FLEXIBLE_ARRAY_MEMBER", "OUTSIDE_MAIN", NULL, NULL, "struct foo { unsigned int x; int arr[]; };" }, - { "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL, NULL, + { "HAVE_GETPAGESIZE", "DEFINES_FUNC", NULL, NULL, "#include \n" "static int func(void) { return getpagesize(); }" }, - { "HAVE_ISBLANK", DEFINES_FUNC, NULL, NULL, + { "HAVE_ISBLANK", "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" "#include \n" "static int func(void) { return isblank(' '); }" }, - { "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, 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, NULL, + { "HAVE_MEMMEM", "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" @@ -248,7 +265,7 @@ static struct test tests[] = { "static void *func(void *h, size_t hl, void *n, size_t nl) {\n" "return memmem(h, hl, n, nl);" "}\n", }, - { "HAVE_MEMRCHR", DEFINES_FUNC, NULL, NULL, + { "HAVE_MEMRCHR", "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" @@ -256,12 +273,12 @@ static struct test tests[] = { "static void *func(void *s, int c, size_t n) {\n" "return memrchr(s, c, n);" "}\n", }, - { "HAVE_MMAP", DEFINES_FUNC, NULL, NULL, + { "HAVE_MMAP", "DEFINES_FUNC", NULL, NULL, "#include \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|MAY_NOT_COMPILE, NULL, NULL, + { "HAVE_PROC_SELF_MAPS", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#include \n" "#include \n" "#include \n" @@ -269,7 +286,7 @@ static struct test tests[] = { " return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n" "}\n" }, { "HAVE_QSORT_R_PRIVATE_LAST", - DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL, + "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" @@ -284,20 +301,20 @@ static struct test tests[] = { " return called && array[0] == 2 && array[1] == 5 && array[2] == 9 ? 0 : 1;\n" "}\n" }, { "HAVE_STRUCT_TIMESPEC", - DEFINES_FUNC, NULL, NULL, + "DEFINES_FUNC", NULL, NULL, "#include \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, 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, NULL, + { "HAVE_STACK_GROWS_UPWARDS", "DEFINES_EVERYTHING|EXECUTE", NULL, NULL, "#include \n" "static ptrdiff_t nest(const void *base, unsigned int i)\n" "{\n" @@ -309,17 +326,17 @@ static struct test tests[] = { " (void)argv;\n" " return (nest(&argc, argc) > 0) ? 0 : 1;\n" "}\n" }, - { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL, NULL, + { "HAVE_STATEMENT_EXPR", "INSIDE_MAIN", NULL, NULL, "return ({ int x = argc; x == argc ? 0 : 1; });" }, - { "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, NULL, /* Solaris needs this for FIONREAD */ + { "HAVE_SYS_FILIO_H", "OUTSIDE_MAIN", NULL, NULL, /* Solaris needs this for FIONREAD */ "#include \n" }, - { "HAVE_SYS_TERMIOS_H", OUTSIDE_MAIN, NULL, NULL, + { "HAVE_SYS_TERMIOS_H", "OUTSIDE_MAIN", NULL, NULL, "#include \n" }, - { "HAVE_SYS_UNISTD_H", OUTSIDE_MAIN, NULL, NULL, + { "HAVE_SYS_UNISTD_H", "OUTSIDE_MAIN", NULL, NULL, "#include \n" }, - { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL, + { "HAVE_TYPEOF", "INSIDE_MAIN", NULL, NULL, "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" }, - { "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL, + { "HAVE_UNALIGNED_ACCESS", "DEFINES_EVERYTHING|EXECUTE", NULL, NULL, "#include \n" "int main(int argc, char *argv[]) {\n" " (void)argc;\n" @@ -328,28 +345,28 @@ static struct test tests[] = { " int *x = (int *)pad, *y = (int *)(pad + 1);\n" " return *x == *y;\n" "}\n" }, - { "HAVE_UTIME", DEFINES_FUNC, NULL, NULL, + { "HAVE_UTIME", "DEFINES_FUNC", NULL, NULL, "#include \n" "#include \n" "static int func(const char *filename) {\n" " struct utimbuf times = { 0 };\n" " return utime(filename, ×);\n" "}" }, - { "HAVE_WARN_UNUSED_RESULT", DEFINES_FUNC, NULL, NULL, + { "HAVE_WARN_UNUSED_RESULT", "DEFINES_FUNC", NULL, NULL, "#include \n" "#include \n" "static __attribute__((warn_unused_result)) int func(int i) {\n" " return i + 1;\n" "}" }, - { "HAVE_OPENMP", INSIDE_MAIN, NULL, NULL, + { "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, + { "HAVE_VALGRIND_MEMCHECK_H", "OUTSIDE_MAIN", NULL, NULL, "#include \n" }, - { "HAVE_UCONTEXT", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, + { "HAVE_UCONTEXT", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#include \n" "static int x = 0;\n" @@ -370,7 +387,7 @@ static struct test tests[] = { " return (x == 3) ? 0 : 1;\n" "}\n" }, - { "HAVE_POINTER_SAFE_MAKECONTEXT", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, + { "HAVE_POINTER_SAFE_MAKECONTEXT", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", "HAVE_UCONTEXT", NULL, "#include \n" "#include \n" @@ -422,6 +439,20 @@ static void c12r_errx(int eval, const char *fmt, ...) exit(eval); } +static void start_test(const char *what, const char *why) +{ + if (like_a_libtool) { + printf("%s%s... ", what, why); + fflush(stdout); + } +} + +static void end_test(bool result) +{ + if (like_a_libtool) + printf("%s\n", result ? "yes" : "no"); +} + static size_t fcopy(FILE *fsrc, FILE *fdst) { char buffer[BUFSIZ]; @@ -570,32 +601,27 @@ static bool run_test(const char *cmd, struct test *test) c12r_err(1, "creating %s", INPUT_FILE); fprintf(outf, "%s", PRE_BOILERPLATE); - switch (test->style & ~(EXECUTE|MAY_NOT_COMPILE)) { - case INSIDE_MAIN: + + if (strstr(test->style, "INSIDE_MAIN")) { fprintf(outf, "%s", MAIN_START_BOILERPLATE); fprintf(outf, "%s", test->fragment); fprintf(outf, "%s", MAIN_END_BOILERPLATE); - break; - case OUTSIDE_MAIN: + } else if (strstr(test->style, "OUTSIDE_MAIN")) { fprintf(outf, "%s", test->fragment); fprintf(outf, "%s", MAIN_START_BOILERPLATE); fprintf(outf, "%s", MAIN_BODY_BOILERPLATE); fprintf(outf, "%s", MAIN_END_BOILERPLATE); - break; - case DEFINES_FUNC: + } else if (strstr(test->style, "DEFINES_FUNC")) { fprintf(outf, "%s", test->fragment); fprintf(outf, "%s", MAIN_START_BOILERPLATE); fprintf(outf, "%s", USE_FUNC_BOILERPLATE); fprintf(outf, "%s", MAIN_BODY_BOILERPLATE); fprintf(outf, "%s", MAIN_END_BOILERPLATE); - break; - case DEFINES_EVERYTHING: + } else if (strstr(test->style, "DEFINES_EVERYTHING")) { fprintf(outf, "%s", test->fragment); - break; - default: - abort(); - - } + } else + c12r_errx(2, "Unknown style for test %s: %s", + test->name, test->style); if (verbose > 1) { fseek(outf, 0, SEEK_SET); @@ -624,6 +650,7 @@ static bool run_test(const char *cmd, struct test *test) printf("Extra link line: %s", newcmd); } + start_test("checking for ", test->name); output = run(newcmd, &status); free(newcmd); @@ -633,7 +660,8 @@ static bool run_test(const char *cmd, struct test *test) printf("Compile %s for %s, status %i: %s\n", status ? "fail" : "warning", test->name, status, output); - if ((test->style & EXECUTE) && !(test->style & MAY_NOT_COMPILE)) + if (strstr(test->style, "EXECUTE") + && !strstr(test->style, "MAY_NOT_COMPILE")) c12r_errx(1, "Test for %s did not compile:\n%s", test->name, output); test->answer = false; @@ -642,9 +670,10 @@ static bool run_test(const char *cmd, struct test *test) /* Compile succeeded. */ free(output); /* We run INSIDE_MAIN tests for sanity checking. */ - if ((test->style & EXECUTE) || (test->style & INSIDE_MAIN)) { + if (strstr(test->style, "EXECUTE") + || strstr(test->style, "INSIDE_MAIN")) { output = run("." DIR_SEP OUTPUT_FILE, &status); - if (!(test->style & EXECUTE) && status != 0) + if (!strstr(test->style, "EXECUTE") && status != 0) c12r_errx(1, "Test for %s failed with %i:\n%s", test->name, status, output); if (verbose && status) @@ -654,6 +683,7 @@ static bool run_test(const char *cmd, struct test *test) test->answer = (status == 0); } test->done = true; + end_test(test->answer); if (test->answer && test->overrides) { struct test *override = find_test(test->overrides); @@ -672,13 +702,16 @@ int main(int argc, const char *argv[]) const char *outflag = DEFAULT_OUTPUT_EXE_FLAG; const char *configurator_cc = NULL; const char *orig_cc; + const char *varfile = NULL; + const char *headerfile = NULL; + FILE *outf; if (argc > 0) progname = argv[0]; while (argc > 1) { if (strcmp(argv[1], "--help") == 0) { - printf("Usage: configurator [-v] [-O] [--configurator-cc=] [ ...]\n" + printf("Usage: configurator [-v] [--var-file=] [-O] [--configurator-cc=] [--autotools-style] [ ...]\n" " will have \" \" appended\n" "Default: %s %s %s\n", DEFAULT_COMPILER, DEFAULT_FLAGS, @@ -707,6 +740,18 @@ int main(int argc, const char *argv[]) configurator_cc = argv[1] + 18; argc--; argv++; + } else if (strncmp(argv[1], "--var-file=", 11) == 0) { + varfile = argv[1] + 11; + argc--; + argv++; + } else if (strcmp(argv[1], "--autotools-style") == 0) { + like_a_libtool = true; + argc--; + argv++; + } else if (strncmp(argv[1], "--header-file=", 14) == 0) { + headerfile = argv[1] + 14; + argc--; + argv++; } else { break; } @@ -720,6 +765,11 @@ int main(int argc, const char *argv[]) argv[1] = configurator_cc; cmd = connect_args(argv, outflag, OUTPUT_FILE " " INPUT_FILE); + if (like_a_libtool) { + start_test("Making autoconf users comfortable", ""); + sleep(1); + end_test(1); + } for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) run_test(cmd, &tests[i]); free(cmd); @@ -727,21 +777,56 @@ int main(int argc, const char *argv[]) remove(OUTPUT_FILE); remove(INPUT_FILE); - printf("/* Generated by CCAN configurator */\n" + if (varfile) { + FILE *vars; + + if (strcmp(varfile, "-") == 0) + vars = stdout; + else { + start_test("Writing variables to ", varfile); + vars = fopen(varfile, "a"); + if (!vars) + c12r_err(2, "Could not open %s", varfile); + } + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + fprintf(vars, "%s=%u\n", tests[i].name, tests[i].answer); + if (vars != stdout) { + if (fclose(vars) != 0) + c12r_err(2, "Closing %s", varfile); + end_test(1); + } + } + + if (headerfile) { + start_test("Writing header to ", headerfile); + outf = fopen(headerfile, "w"); + if (!outf) + c12r_err(2, "Could not open %s", headerfile); + } else + outf = stdout; + + fprintf(outf, "/* Generated by CCAN configurator */\n" "#ifndef CCAN_CONFIG_H\n" "#define CCAN_CONFIG_H\n"); - printf("#ifndef _GNU_SOURCE\n"); - printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n"); - printf("#endif\n"); - printf("#define CCAN_COMPILER \"%s\"\n", orig_cc); + fprintf(outf, "#ifndef _GNU_SOURCE\n"); + fprintf(outf, "#define _GNU_SOURCE /* Always use GNU extensions. */\n"); + fprintf(outf, "#endif\n"); + fprintf(outf, "#define CCAN_COMPILER \"%s\"\n", orig_cc); cmd = connect_args(argv + 1, "", ""); - printf("#define CCAN_CFLAGS \"%s\"\n", cmd); + fprintf(outf, "#define CCAN_CFLAGS \"%s\"\n", cmd); free(cmd); - printf("#define CCAN_OUTPUT_EXE_CFLAG \"%s\"\n\n", outflag); + fprintf(outf, "#define CCAN_OUTPUT_EXE_CFLAG \"%s\"\n\n", outflag); /* This one implies "#include