tools/configurator: better descriptions for --autotools-style.
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 12 Jun 2018 02:34:51 +0000 (12:04 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 12 Jun 2018 02:34:51 +0000 (12:04 +0930)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
tools/configurator/configurator.c

index afb67ca8ce269dcdae605de0c1a6913f4aaa9b8f..43fbf1f6b94067d565377fc05c206f087fce78c2 100644 (file)
@@ -70,6 +70,7 @@ static bool like_a_libtool = false;
 
 struct test {
        const char *name;
+       const char *desc;
        /*
         * Template style flags (pick one):
         * OUTSIDE_MAIN:
@@ -100,14 +101,17 @@ struct test {
 };
 
 static struct test tests[] = {
-       { "HAVE_32BIT_OFF_T", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
+       { "HAVE_32BIT_OFF_T", "off_t is 32 bits",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
          "#include <sys/types.h>\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 +122,105 @@ 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_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 <stdlib.h>\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 <execinfo.h>",
+         "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, 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 <byteswap.h>\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", "<intrinsics.h>",
+         "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,
+       { "HAVE_BYTESWAP_H", "<byteswap.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
          "#include <byteswap.h>\n" },
-       { "HAVE_CLOCK_GETTIME",
+       { "HAVE_CLOCK_GETTIME", "clock_gettime() declaration",
          "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC", NULL,
          "#include <time.h>\n"
          "static struct timespec func(void) {\n"
@@ -195,7 +228,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 +240,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 <sys/types.h>\n"
          "#include <sys/stat.h>\n"
          "#include <fcntl.h>\n"
@@ -219,7 +254,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", "<err.h>",
+         "DEFINES_FUNC", NULL, NULL,
          "#include <err.h>\n"
          "static void func(int arg) {\n"
          "     if (arg == 0)\n"
@@ -231,33 +267,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 <sys/types.h>\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 <unistd.h>",
+         "DEFINES_FUNC", NULL, NULL,
          "#include <unistd.h>\n"
          "static int func(void) { return getpagesize(); }" },
-       { "HAVE_ISBLANK", "DEFINES_FUNC", NULL, NULL,
+       { "HAVE_ISBLANK", "isblank() in <ctype.h>",
+         "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, 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 <string.h>",
+         "DEFINES_FUNC", NULL, NULL,
          "#ifndef _GNU_SOURCE\n"
          "#define _GNU_SOURCE\n"
          "#endif\n"
@@ -265,7 +308,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 <string.h>",
+         "DEFINES_FUNC", NULL, NULL,
          "#ifndef _GNU_SOURCE\n"
          "#define _GNU_SOURCE\n"
          "#endif\n"
@@ -273,19 +317,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 <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|MAY_NOT_COMPILE", NULL, NULL,
+       { "HAVE_PROC_SELF_MAPS", "/proc/self/maps exists",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
          "#include <sys/types.h>\n"
          "#include <sys/stat.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",
+       { "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 +346,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 <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",
+       { "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 <stddef.h>\n"
          "static ptrdiff_t nest(const void *base, unsigned int i)\n"
          "{\n"
@@ -326,17 +373,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", "<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,
+       { "HAVE_SYS_TERMIOS_H", "<sys/termios.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
          "#include <sys/termios.h>\n" },
-       { "HAVE_SYS_UNISTD_H", "OUTSIDE_MAIN", NULL, NULL,
+       { "HAVE_SYS_UNISTD_H", "<sys/unistd.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
          "#include <sys/unistd.h>\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 <string.h>\n"
          "int main(int argc, char *argv[]) {\n"
          "     (void)argc;\n"
@@ -345,28 +398,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 <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, NULL,
+       { "HAVE_WARN_UNUSED_RESULT", "__attribute__((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,
+       { "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", "<valgrind/memcheck.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
          "#include <valgrind/memcheck.h>\n" },
-       { "HAVE_UCONTEXT", "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE",
+       { "HAVE_UCONTEXT", "working <ucontext.h",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE",
          NULL, NULL,
          "#include <ucontext.h>\n"
          "static int x = 0;\n"
@@ -387,7 +445,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 <stddef.h>\n"
          "#include <ucontext.h>\n"
@@ -650,7 +709,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);