configurator: Enable running configurator in wrapper

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index f15f34483c36352549af73a9facea230ced71bfe..048b801d181636186a11fc99de0d003d68cff18f 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -431,7 +431,7 @@ static const struct test base_tests[] = {
          "     return i + 1;\n"
          "}" },
        { "HAVE_OPENMP", "#pragma omp and -fopenmp support",
-         "INSIDE_MAIN", NULL, NULL,
+         "INSIDE_MAIN|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
          "int i;\n"
          "#pragma omp parallel for\n"
          "for(i = 0; i < 0; i++) {};\n"
@@ -488,6 +488,13 @@ static const struct test base_tests[] = {
          "     return worked ? 0 : 1;\n"
          "}\n"
        },
+       { "HAVE_BUILTIN_CPU_SUPPORTS", "__builtin_cpu_supports()",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <stdbool.h>\n"
+         "static bool func(void) {\n"
+         "     return __builtin_cpu_supports(\"mmx\");\n"
+         "}"
+       },
 };
 
 static void c12r_err(int eval, const char *fmt, ...)
@@ -632,7 +639,7 @@ static struct test *find_test(const char *name)
 #define MAIN_BODY_BOILERPLATE "return 0;\n"
 #define MAIN_END_BOILERPLATE "}\n"
 
-static bool run_test(const char *cmd, struct test *test)
+static bool run_test(const char *cmd, const char* wrapper, struct test *test)
 {
        char *output, *newcmd;
        FILE *outf;
@@ -660,7 +667,7 @@ static bool run_test(const char *cmd, struct test *test)
                                dep++;
                                positive = false;
                        }
-                       if (run_test(cmd, find_test(dep)) != positive) {
+                       if (run_test(cmd, wrapper, find_test(dep)) != positive) {
                                test->answer = false;
                                test->done = true;
                                return test->answer;
@@ -750,7 +757,21 @@ static bool run_test(const char *cmd, struct test *test)
                /* We run INSIDE_MAIN tests for sanity checking. */
                if (strstr(test->style, "EXECUTE")
                    || strstr(test->style, "INSIDE_MAIN")) {
-                       output = run("." DIR_SEP OUTPUT_FILE, &status);
+                       char* cmd = "." DIR_SEP OUTPUT_FILE;
+                       if(wrapper) {
+                               // string length and null terminator.
+                               size_t size = strlen(wrapper) + strlen(" ") + strlen(cmd) + 1;
+                               char* newcmd = malloc(size);
+                               memset(newcmd, '\0', size);
+                               strcat(newcmd, wrapper);
+                               strcat(newcmd, " ");
+                               strcat(newcmd, cmd);
+                               cmd = newcmd;
+                       }
+                       output = run(cmd, &status);
+                       if (wrapper) {
+                               free(cmd);
+                       }
                        if (!strstr(test->style, "EXECUTE") && status != 0)
                                c12r_errx(EXIT_BAD_TEST,
                                          "Test for %s failed with %i:\n%s",
@@ -901,6 +922,7 @@ int main(int argc, const char *argv[])
                = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL };
        const char *outflag = DEFAULT_OUTPUT_EXE_FLAG;
        const char *configurator_cc = NULL;
+       const char *wrapper = NULL;
        const char *orig_cc;
        const char *varfile = NULL;
        const char *headerfile = NULL;
@@ -912,7 +934,7 @@ int main(int argc, const char *argv[])
 
        while (argc > 1) {
                if (strcmp(argv[1], "--help") == 0) {
-                       printf("Usage: configurator [-v] [--var-file=<filename>] [-O<outflag>] [--configurator-cc=<compiler-for-tests>] [--autotools-style] [--extra-tests] [<compiler> <flags>...]\n"
+                       printf("Usage: configurator [-v] [--var-file=<filename>] [-O<outflag>] [--configurator-cc=<compiler-for-tests>] [--wrapper=<wrapper-for-tests>] [--autotools-style] [--extra-tests] [<compiler> <flags>...]\n"
                               "  <compiler> <flags> will have \"<outflag> <outfile> <infile.c>\" appended\n"
                               "Default: %s %s %s\n",
                               DEFAULT_COMPILER, DEFAULT_FLAGS,
@@ -941,6 +963,10 @@ int main(int argc, const char *argv[])
                        configurator_cc = argv[1] + 18;
                        argc--;
                        argv++;
+               } else if (strncmp(argv[1], "--wrapper=", 10) == 0) {
+                       wrapper = argv[1] + 10;
+                       argc--;
+                       argv++;
                } else if (strncmp(argv[1], "--var-file=", 11) == 0) {
                        varfile = argv[1] + 11;
                        argc--;
@@ -988,7 +1014,7 @@ int main(int argc, const char *argv[])
                end_test(1);
        }
        for (i = 0; tests[i].name; i++)
-               run_test(cmd, &tests[i]);
+               run_test(cmd, wrapper, &tests[i]);
        free(cmd);
 
        remove(OUTPUT_FILE);