X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=048b801d181636186a11fc99de0d003d68cff18f;hp=874ec12ad7c91fb2eb047374e7e7eeeda10f5fe5;hb=42d7b648bd295e2204c5d064256fb1ad382b41c9;hpb=e882122346f7bfc8a5769d06c394c893867290ab diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c index 874ec12a..048b801d 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 @@ -131,6 +136,15 @@ static const struct test base_tests[] = { { "HAVE_ATTRIBUTE_CONST", "__attribute__((const)) support", "DEFINES_FUNC", NULL, NULL, "static int __attribute__((const)) func(int x) { return x; }" }, + { "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; }" }, @@ -417,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" @@ -474,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 \n" + "static bool func(void) {\n" + " return __builtin_cpu_supports(\"mmx\");\n" + "}" + }, }; static void c12r_err(int eval, const char *fmt, ...) @@ -544,7 +565,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; } @@ -564,7 +585,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); @@ -605,7 +626,7 @@ static struct test *find_test(const char *name) if (strcmp(tests[i].name, name) == 0) return &tests[i]; } - c12r_errx(2, "Unknown test %s", name); + c12r_errx(EXIT_BAD_TEST, "Unknown test %s", name); abort(); } @@ -618,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; @@ -646,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; @@ -661,7 +682,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); @@ -683,7 +704,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) { @@ -725,7 +746,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); @@ -735,9 +757,24 @@ 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(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); @@ -774,7 +811,7 @@ static char *any_field(char **fieldname) eq = strchr(p, '='); if (!eq) - c12r_errx(2, "no = in line: %s", p); + c12r_errx(EXIT_BAD_INPUT, "no = in line: %s", p); *eq = '\0'; *fieldname = strdup(p); p = eq + 1; @@ -792,10 +829,11 @@ static char *read_field(const char *name, bool compulsory) if (!value) { if (!compulsory) return NULL; - c12r_errx(2, "Could not read field %s", name); + c12r_errx(EXIT_BAD_INPUT, "Could not read field %s", name); } if (strcmp(fieldname, name) != 0) - c12r_errx(2, "Expected field %s not %s", name, fieldname); + c12r_errx(EXIT_BAD_INPUT, + "Expected field %s not %s", name, fieldname); return value; } @@ -845,11 +883,11 @@ static bool read_test(struct test *test) else if (strcmp(field, "code") == 0) break; else - c12r_errx(2, "Unknown field %s in %s", + c12r_errx(EXIT_BAD_INPUT, "Unknown field %s in %s", field, test->name); } if (!value) - c12r_errx(2, "Missing code in %s", test->name); + c12r_errx(EXIT_BAD_INPUT, "Missing code in %s", test->name); if (strlen(value) == 0) { /* Multiline program, read to END comment */ @@ -871,7 +909,8 @@ static void read_tests(size_t num_tests) { while (read_test(tests + num_tests)) { num_tests++; - tests = realloc(tests, num_tests * sizeof(tests[0])); + tests = realloc(tests, (num_tests + 1) * sizeof(tests[0])); + tests[num_tests].name = NULL; } } @@ -883,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; @@ -894,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=] [-O] [--configurator-cc=] [--autotools-style] [--extra-tests] [ ...]\n" + printf("Usage: configurator [-v] [--var-file=] [-O] [--configurator-cc=] [--wrapper=] [--autotools-style] [--extra-tests] [ ...]\n" " will have \" \" appended\n" "Default: %s %s %s\n", DEFAULT_COMPILER, DEFAULT_FLAGS, @@ -909,7 +949,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--; @@ -923,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--; @@ -942,7 +986,7 @@ int main(int argc, const char *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; } @@ -970,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); @@ -985,13 +1029,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; 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); } } @@ -1000,7 +1046,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; @@ -1023,7 +1070,7 @@ int main(int argc, const char *argv[]) if (headerfile) { if (fclose(outf) != 0) - c12r_err(2, "Closing %s", headerfile); + c12r_err(EXIT_TROUBLE_RUNNING, "Closing %s", headerfile); end_test(1); }