str: fix tests on unsigned chars, and !HAVE_ISBLANK.

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index af7955a3144449db4cb1d04fc82454c40558a8ae..b78b112f4a9f0b523de52a4b212bc12b17fa9fad 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -24,6 +24,7 @@ enum test_style {
        DEFINES_FUNC            = 0x2,
        INSIDE_MAIN             = 0x4,
        DEFINES_EVERYTHING      = 0x8,
+       MAY_NOT_COMPILE         = 0x10,
        EXECUTE                 = 0x8000
 };
 
@@ -37,6 +38,11 @@ struct test {
 };
 
 static struct test tests[] = {
+       { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL,
+         "#include <sys/types.h>\n"
+         "int main(int argc, char *argv[]) {\n"
+         "     return sizeof(off_t) == 4 ? 0 : 1;\n"
+         "}\n" },
        { "HAVE_ALIGNOF", INSIDE_MAIN, NULL,
          "return __alignof__(double) > 0 ? 0 : 1;" },
        { "HAVE_ASPRINTF", DEFINES_FUNC, NULL,
@@ -94,6 +100,13 @@ static struct test tests[] = {
        { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL,
          "int *foo = (int[]) { 1, 2, 3, 4 };\n"
          "return foo[0] ? 0 : 1;" },
+       { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE,
+         "HAVE_32BIT_OFF_T",
+         "#define _FILE_OFFSET_BITS 64\n"
+         "#include <sys/types.h>\n"
+         "int main(int argc, char *argv[]) {\n"
+         "     return sizeof(off_t) == 8 ? 0 : 1;\n"
+         "}\n" },
        { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
          "for (int i = 0; i < argc; i++) { return 0; };\n"
          "return 1;" },
@@ -102,6 +115,10 @@ static struct test tests[] = {
        { "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL,
          "#include <unistd.h>\n"
          "static int func(void) { return getpagesize(); }" },
+       { "HAVE_ISBLANK", DEFINES_FUNC, NULL,
+         "#define _GNU_SOURCE\n"
+         "#include <ctype.h>\n"
+         "static int func(void) { return isblank(' '); }" },
        { "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL,
          "union { int i; char c[sizeof(int)]; } u;\n"
          "u.i = 0x01020304;\n"
@@ -117,12 +134,18 @@ static struct test tests[] = {
          "static void *func(int fd) {\n"
          "     return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
          "}" },
-       { "HAVE_NESTED_FUNCTIONS", DEFINES_FUNC, NULL,
-         "void (*func(int val))(int);\n"
-         "void (*func(int val))(int) {\n"
-         "     auto void add(int val2);\n"
-         "     void add(int val2) { val += val2; }\n"
-         "     return add;\n"
+       { "HAVE_QSORT_R_PRIVATE_LAST",
+         DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL,
+         "#define _GNU_SOURCE 1\n"
+         "#include <stdlib.h>\n"
+         "static int cmp(const void *lp, const void *rp, void *priv) {\n"
+         " *(unsigned int *)priv = 1;\n"
+         " return *(const int *)lp - *(const int *)rp; }\n"
+         "int main(void) {\n"
+         " int array[] = { 9, 2, 5 };\n"
+         " unsigned int called = 0;\n"
+         " 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_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL,
          "static long nest(const void *base, unsigned int i)\n"
@@ -270,7 +293,7 @@ static bool run_test(const char *cmd, struct test *test)
                err(1, "creating %s", INPUT_FILE);
 
        fprintf(outf, "%s", PRE_BOILERPLATE);
-       switch (test->style & ~EXECUTE) {
+       switch (test->style & ~(EXECUTE|MAY_NOT_COMPILE)) {
        case INSIDE_MAIN:
                fprintf(outf, "%s", MAIN_START_BOILERPLATE);
                fprintf(outf, "%s", test->fragment);
@@ -307,7 +330,7 @@ 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)
+               if ((test->style & EXECUTE) && !(test->style & MAY_NOT_COMPILE))
                        errx(1, "Test for %s did not compile:\n%s",
                             test->name, output);
                test->answer = false;