X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=1386fc90c8d72be6e734eb9f21a2d661b4c6f86c;hp=afb67ca8ce269dcdae605de0c1a6913f4aaa9b8f;hb=97026cedabce510b2e2e547120f04fe0f6a5ecab;hpb=f872966ce8bc61a91af733f405ba8fcce18f85a2 diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c index afb67ca8..1386fc90 100644 --- a/tools/configurator/configurator.c +++ b/tools/configurator/configurator.c @@ -26,6 +26,11 @@ */ #define _POSIX_C_SOURCE 200809L /* For pclose, popen, strdup */ +#define EXIT_BAD_USAGE 1 +#define EXIT_TROUBLE_RUNNING 2 +#define EXIT_BAD_TEST 3 +#define EXIT_BAD_INPUT 4 + #include #include #include @@ -70,6 +75,7 @@ static bool like_a_libtool = false; struct test { const char *name; + const char *desc; /* * Template style flags (pick one): * OUTSIDE_MAIN: @@ -99,15 +105,21 @@ struct test { bool answer; }; -static struct test tests[] = { - { "HAVE_32BIT_OFF_T", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, +/* Terminated by a NULL name */ +static struct test *tests; + +static const struct test base_tests[] = { + { "HAVE_32BIT_OFF_T", "off_t is 32 bits", + "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", "__alignof__ support", + "INSIDE_MAIN", NULL, NULL, "return __alignof__(double) > 0 ? 0 : 1;" }, - { "HAVE_ASPRINTF", "DEFINES_FUNC", NULL, NULL, + { "HAVE_ASPRINTF", "asprintf() declaration", + "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" @@ -118,76 +130,114 @@ static struct test tests[] = { " p = NULL;\n" " return p;\n" "}" }, - { "HAVE_ATTRIBUTE_COLD", "DEFINES_FUNC", NULL, NULL, + { "HAVE_ATTRIBUTE_COLD", "__attribute__((cold)) support", + "DEFINES_FUNC", NULL, NULL, "static int __attribute__((cold)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_CONST", "DEFINES_FUNC", NULL, NULL, + { "HAVE_ATTRIBUTE_CONST", "__attribute__((const)) support", + "DEFINES_FUNC", NULL, NULL, "static int __attribute__((const)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_PURE", "DEFINES_FUNC", NULL, NULL, + { "HAVE_ATTRIBUTE_DEPRECATED", "__attribute__((deprecated)) support", + "DEFINES_FUNC", NULL, NULL, + "static int __attribute__((deprecated)) func(int x) { return x; }" }, + { "HAVE_ATTRIBUTE_NONNULL", "__attribute__((nonnull)) support", + "DEFINES_FUNC", NULL, NULL, + "static char *__attribute__((nonnull)) func(char *p) { return p; }" }, + { "HAVE_ATTRIBUTE_SENTINEL", "__attribute__((sentinel)) support", + "DEFINES_FUNC", NULL, NULL, + "static int __attribute__((sentinel)) func(int i, ...) { return i; }" }, + { "HAVE_ATTRIBUTE_PURE", "__attribute__((pure)) support", + "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", "__attribute__((may_alias)) support", + "OUTSIDE_MAIN", NULL, NULL, "typedef short __attribute__((__may_alias__)) short_a;" }, - { "HAVE_ATTRIBUTE_NORETURN", "DEFINES_FUNC", NULL, NULL, + { "HAVE_ATTRIBUTE_NORETURN", "__attribute__((noreturn)) support", + "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", "__attribute__ format printf support", + "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", "__attribute__((unused)) support", + "OUTSIDE_MAIN", NULL, NULL, "static int __attribute__((unused)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_USED", "OUTSIDE_MAIN", NULL, NULL, + { "HAVE_ATTRIBUTE_USED", "__attribute__((used)) support", + "OUTSIDE_MAIN", NULL, NULL, "static int __attribute__((used)) func(int x) { return x; }" }, - { "HAVE_BACKTRACE", "DEFINES_FUNC", NULL, NULL, + { "HAVE_BACKTRACE", "backtrace() in ", + "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", "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", "bswap64 in byteswap.h", + "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", "__builtin_choose_expr support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_choose_expr(1, 0, \"garbage\");" }, - { "HAVE_BUILTIN_CLZ", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_CLZ", "__builtin_clz support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CLZL", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_CLZL", "__builtin_clzl support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CLZLL", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_CLZLL", "__builtin_clzll support", + "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", "__builtin_ctz support", + "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", "__builtin_ctzl support", + "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", "__builtin_ctzll support", + "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", "__builtin_constant_p support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_constant_p(1) ? 0 : 1;" }, - { "HAVE_BUILTIN_EXPECT", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_EXPECT", "__builtin_expect support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_expect(argc == 1, 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_FFS", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_FFS", "__builtin_ffs support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_ffs(0) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_FFSL", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_FFSL", "__builtin_ffsl support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_ffsl(0L) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_FFSLL", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_FFSLL", "__builtin_ffsll support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_ffsll(0LL) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNT", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_POPCOUNT", "__builtin_popcount support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_popcount(255) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNTL", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_POPCOUNTL", "__builtin_popcountl support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_popcountl(255L) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNTLL", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_POPCOUNTLL", "__builtin_popcountll support", + "INSIDE_MAIN", NULL, NULL, "return __builtin_popcountll(255LL) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", "INSIDE_MAIN", NULL, NULL, + { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", "__builtin_types_compatible_p support", + "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", + { "HAVE_CLOCK_GETTIME", "clock_gettime() declaration", "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC", NULL, "#include \n" "static struct timespec func(void) {\n" @@ -195,7 +245,7 @@ static struct test tests[] = { " clock_gettime(CLOCK_REALTIME, &ts);\n" " return ts;\n" "}\n" }, - { "HAVE_CLOCK_GETTIME_IN_LIBRT", + { "HAVE_CLOCK_GETTIME_IN_LIBRT", "clock_gettime() in librt", "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC !HAVE_CLOCK_GETTIME", "-lrt", @@ -207,10 +257,12 @@ static struct test tests[] = { "}\n", /* This means HAVE_CLOCK_GETTIME, too */ "HAVE_CLOCK_GETTIME" }, - { "HAVE_COMPOUND_LITERALS", "INSIDE_MAIN", NULL, NULL, + { "HAVE_COMPOUND_LITERALS", "compound literal support", + "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", "fchdir support", + "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#include \n" "#include \n" "#include \n" @@ -219,7 +271,8 @@ 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" @@ -231,33 +284,40 @@ 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", "_FILE_OFFSET_BITS to get 64-bit offsets", + "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", "for loop declaration support", + "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", "flexible array member support", + "OUTSIDE_MAIN", NULL, NULL, "struct foo { unsigned int x; int arr[]; };" }, - { "HAVE_GETPAGESIZE", "DEFINES_FUNC", NULL, NULL, + { "HAVE_GETPAGESIZE", "getpagesize() in ", + "DEFINES_FUNC", NULL, NULL, "#include \n" "static int func(void) { return getpagesize(); }" }, - { "HAVE_ISBLANK", "DEFINES_FUNC", NULL, NULL, + { "HAVE_ISBLANK", "isblank() in ", + "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", "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", "memmem in ", + "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" @@ -265,7 +325,8 @@ 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", "memrchr in ", + "DEFINES_FUNC", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" "#endif\n" @@ -273,19 +334,21 @@ 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", "mmap() declaration", + "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", "/proc/self/maps exists", + "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#include \n" "#include \n" "#include \n" "int main(void) {\n" " return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n" "}\n" }, - { "HAVE_QSORT_R_PRIVATE_LAST", + { "HAVE_QSORT_R_PRIVATE_LAST", "qsort_r cmp takes trailing arg", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" @@ -300,21 +363,22 @@ 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", + { "HAVE_STRUCT_TIMESPEC", "struct timespec declaration", "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", + { "HAVE_SECTION_START_STOP", "__attribute__((section)) and __start/__stop", "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", "stack grows upwards", + "DEFINES_EVERYTHING|EXECUTE", NULL, NULL, "#include \n" "static ptrdiff_t nest(const void *base, unsigned int i)\n" "{\n" @@ -326,17 +390,23 @@ 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", "statement expression support", + "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", "__typeof__ support", + "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", "unaligned access to int", + "DEFINES_EVERYTHING|EXECUTE", NULL, NULL, "#include \n" "int main(int argc, char *argv[]) {\n" " (void)argc;\n" @@ -345,28 +415,33 @@ 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", "utime() declaration", + "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", "__attribute__((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", "#pragma omp and -fopenmp support", + "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", "working \n" "static int x = 0;\n" @@ -387,7 +462,8 @@ 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", "passing pointers via makecontext()", + "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", "HAVE_UCONTEXT", NULL, "#include \n" "#include \n" @@ -482,7 +558,7 @@ static char *grab_stream(FILE *file) } size += ret; if (ferror(file)) - c12r_err(1, "reading from command"); + c12r_err(EXIT_TROUBLE_RUNNING, "reading from command"); buffer[size] = '\0'; return buffer; } @@ -502,7 +578,7 @@ static char *run(const char *cmd, int *exitstatus) cmdout = popen(cmdredir, "r"); if (!cmdout) - c12r_err(1, "popen \"%s\"", cmdredir); + c12r_err(EXIT_TROUBLE_RUNNING, "popen \"%s\"", cmdredir); free(cmdredir); @@ -539,10 +615,11 @@ static struct test *find_test(const char *name) { unsigned int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + for (i = 0; tests[i].name; i++) { if (strcmp(tests[i].name, name) == 0) return &tests[i]; } + c12r_errx(EXIT_BAD_TEST, "Unknown test %s", name); abort(); } @@ -598,7 +675,7 @@ static bool run_test(const char *cmd, struct test *test) outf = fopen(INPUT_FILE, verbose > 1 ? "w+" : "w"); if (!outf) - c12r_err(1, "creating %s", INPUT_FILE); + c12r_err(EXIT_TROUBLE_RUNNING, "creating %s", INPUT_FILE); fprintf(outf, "%s", PRE_BOILERPLATE); @@ -620,7 +697,7 @@ static bool run_test(const char *cmd, struct test *test) } else if (strstr(test->style, "DEFINES_EVERYTHING")) { fprintf(outf, "%s", test->fragment); } else - c12r_errx(2, "Unknown style for test %s: %s", + c12r_errx(EXIT_BAD_TEST, "Unknown style for test %s: %s", test->name, test->style); if (verbose > 1) { @@ -650,7 +727,7 @@ static bool run_test(const char *cmd, struct test *test) printf("Extra link line: %s", newcmd); } - start_test("checking for ", test->name); + start_test("checking for ", test->desc); output = run(newcmd, &status); free(newcmd); @@ -662,7 +739,8 @@ static bool run_test(const char *cmd, struct test *test) test->name, status, output); if (strstr(test->style, "EXECUTE") && !strstr(test->style, "MAY_NOT_COMPILE")) - c12r_errx(1, "Test for %s did not compile:\n%s", + c12r_errx(EXIT_BAD_TEST, + "Test for %s did not compile:\n%s", test->name, output); test->answer = false; free(output); @@ -674,7 +752,8 @@ static bool run_test(const char *cmd, struct test *test) || strstr(test->style, "INSIDE_MAIN")) { output = run("." DIR_SEP OUTPUT_FILE, &status); if (!strstr(test->style, "EXECUTE") && status != 0) - c12r_errx(1, "Test for %s failed with %i:\n%s", + c12r_errx(EXIT_BAD_TEST, + "Test for %s failed with %i:\n%s", test->name, status, output); if (verbose && status) printf("%s exited %i\n", test->name, status); @@ -693,6 +772,126 @@ static bool run_test(const char *cmd, struct test *test) return test->answer; } +static char *any_field(char **fieldname) +{ + char buf[1000]; + for (;;) { + char *p, *eq; + + if (!fgets(buf, sizeof(buf), stdin)) + return NULL; + + p = buf; + /* Ignore whitespace, lines starting with # */ + while (*p == ' ' || *p == '\t') + p++; + if (*p == '#' || *p == '\n') + continue; + + eq = strchr(p, '='); + if (!eq) + c12r_errx(EXIT_BAD_INPUT, "no = in line: %s", p); + *eq = '\0'; + *fieldname = strdup(p); + p = eq + 1; + if (strlen(p) && p[strlen(p)-1] == '\n') + p[strlen(p)-1] = '\0'; + return strdup(p); + } +} + +static char *read_field(const char *name, bool compulsory) +{ + char *fieldname, *value; + + value = any_field(&fieldname); + if (!value) { + if (!compulsory) + return NULL; + c12r_errx(EXIT_BAD_INPUT, "Could not read field %s", name); + } + if (strcmp(fieldname, name) != 0) + c12r_errx(EXIT_BAD_INPUT, + "Expected field %s not %s", name, fieldname); + return value; +} + +/* Test descriptions from stdin: + * Lines starting with # or whitespace-only are ignored. + * + * First three non-ignored lines must be: + * var= + * desc= + * style=OUTSIDE_MAIN DEFINES_FUNC INSIDE_MAIN DEFINES_EVERYTHING EXECUTE MAY_NOT_COMPILE + * + * Followed by optional lines: + * depends= + * link= + * flags= + * overrides= + * + * Finally a code line, either: + * code= OR + * code= + * + * + * + * And looks like this next comment: */ +/*END*/ +static bool read_test(struct test *test) +{ + char *field, *value; + char buf[1000]; + + memset(test, 0, sizeof(*test)); + test->name = read_field("var", false); + if (!test->name) + return false; + test->desc = read_field("desc", true); + test->style = read_field("style", true); + /* Read any optional fields. */ + while ((value = any_field(&field)) != NULL) { + if (strcmp(field, "depends") == 0) + test->depends = value; + else if (strcmp(field, "link") == 0) + test->link = value; + else if (strcmp(field, "flags") == 0) + test->flags = value; + else if (strcmp(field, "overrides") == 0) + test->overrides = value; + else if (strcmp(field, "code") == 0) + break; + else + c12r_errx(EXIT_BAD_INPUT, "Unknown field %s in %s", + field, test->name); + } + if (!value) + c12r_errx(EXIT_BAD_INPUT, "Missing code in %s", test->name); + + if (strlen(value) == 0) { + /* Multiline program, read to END comment */ + while (fgets(buf, sizeof(buf), stdin) != 0) { + size_t n; + if (strncmp(buf, "/*END*/", 7) == 0) + break; + n = strlen(value); + value = realloc(value, n + strlen(buf) + 1); + strcpy(value + n, buf); + n += strlen(buf); + } + } + test->fragment = value; + return true; +} + +static void read_tests(size_t num_tests) +{ + while (read_test(tests + num_tests)) { + num_tests++; + tests = realloc(tests, num_tests * sizeof(tests[0])); + } +} + int main(int argc, const char *argv[]) { char *cmd; @@ -704,6 +903,7 @@ int main(int argc, const char *argv[]) const char *orig_cc; const char *varfile = NULL; const char *headerfile = NULL; + bool extra_tests = false; FILE *outf; if (argc > 0) @@ -711,7 +911,7 @@ int main(int argc, const char *argv[]) while (argc > 1) { if (strcmp(argv[1], "--help") == 0) { - printf("Usage: configurator [-v] [--var-file=] [-O] [--configurator-cc=] [--autotools-style] [ ...]\n" + printf("Usage: configurator [-v] [--var-file=] [-O] [--configurator-cc=] [--autotools-style] [--extra-tests] [ ...]\n" " will have \" \" appended\n" "Default: %s %s %s\n", DEFAULT_COMPILER, DEFAULT_FLAGS, @@ -726,7 +926,7 @@ int main(int argc, const char *argv[]) fprintf(stderr, "%s: option requires an argument -- O\n", argv[0]); - exit(1); + exit(EXIT_BAD_USAGE); } } else if (strcmp(argv[1], "-v") == 0) { argc--; @@ -752,10 +952,14 @@ int main(int argc, const char *argv[]) headerfile = argv[1] + 14; argc--; argv++; + } else if (strcmp(argv[1], "--extra-tests") == 0) { + extra_tests = true; + argc--; + argv++; } else if (strcmp(argv[1], "--") == 0) { break; } else if (argv[1][0] == '-') { - c12r_errx(2, "Unknown option %s", argv[1]); + c12r_errx(EXIT_BAD_USAGE, "Unknown option %s", argv[1]); } else { break; } @@ -764,6 +968,14 @@ int main(int argc, const char *argv[]) if (argc == 1) argv = default_args; + /* Copy with NULL entry at end */ + tests = calloc(sizeof(base_tests)/sizeof(base_tests[0]) + 1, + sizeof(base_tests[0])); + memcpy(tests, base_tests, sizeof(base_tests)); + + if (extra_tests) + read_tests(sizeof(base_tests)/sizeof(base_tests[0])); + orig_cc = argv[1]; if (configurator_cc) argv[1] = configurator_cc; @@ -774,7 +986,7 @@ int main(int argc, const char *argv[]) sleep(1); end_test(1); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; tests[i].name; i++) run_test(cmd, &tests[i]); free(cmd); @@ -790,13 +1002,15 @@ int main(int argc, const char *argv[]) start_test("Writing variables to ", varfile); vars = fopen(varfile, "a"); if (!vars) - c12r_err(2, "Could not open %s", varfile); + c12r_err(EXIT_TROUBLE_RUNNING, + "Could not open %s", varfile); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; tests[i].name; 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); + c12r_err(EXIT_TROUBLE_RUNNING, + "Closing %s", varfile); end_test(1); } } @@ -805,7 +1019,8 @@ int main(int argc, const char *argv[]) start_test("Writing header to ", headerfile); outf = fopen(headerfile, "w"); if (!outf) - c12r_err(2, "Could not open %s", headerfile); + c12r_err(EXIT_TROUBLE_RUNNING, + "Could not open %s", headerfile); } else outf = stdout; @@ -822,13 +1037,13 @@ int main(int argc, const char *argv[]) fprintf(outf, "#define CCAN_OUTPUT_EXE_CFLAG \"%s\"\n\n", outflag); /* This one implies "#include