X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=f15f34483c36352549af73a9facea230ced71bfe;hp=a6c965fcad314041945590203b25d73b84381cf3;hb=e16fc94bd8f80800d5203d9182cb3c5224528b0a;hpb=a7188fd690ee1370fa69dd33320770a24f33c071

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index a6c965fc..f15f3448 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 <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -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; }" },
@@ -544,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;
 }
@@ -564,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);
 
@@ -605,7 +619,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();
 }
 
@@ -661,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);
 
@@ -683,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) {
@@ -725,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);
@@ -737,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);
@@ -756,6 +772,127 @@ 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=<varname>
+ *  desc=<description-for-autotools-style>
+ *  style=OUTSIDE_MAIN DEFINES_FUNC INSIDE_MAIN DEFINES_EVERYTHING EXECUTE MAY_NOT_COMPILE
+ *
+ * Followed by optional lines:
+ *  depends=<space-separated-testnames, ! to invert>
+ *  link=<extra args for link line>
+ *  flags=<extra args for compile line>
+ *  overrides=<testname-to-force>
+ *
+ * Finally a code line, either:
+ *  code=<oneline> OR
+ *  code=
+ *  <lines of code>
+ *  <end-comment>
+ *
+ * And <end-comment> 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 + 1) * sizeof(tests[0]));
+		tests[num_tests].name = NULL;
+	}
+}
+
 int main(int argc, const char *argv[])
 {
 	char *cmd;
@@ -767,6 +904,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)
@@ -774,7 +912,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] [<compiler> <flags>...]\n"
+			printf("Usage: configurator [-v] [--var-file=<filename>] [-O<outflag>] [--configurator-cc=<compiler-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,
@@ -789,7 +927,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--;
@@ -815,10 +953,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;
 		}
@@ -832,6 +974,9 @@ int main(int argc, const char *argv[])
 		       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;
@@ -858,13 +1003,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);
 		}
 	}
@@ -873,7 +1020,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;
 
@@ -896,7 +1044,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);
 	}