From: Andreas Schlick <schlick@lavabit.com>
Date: Sat, 2 Apr 2011 01:30:51 +0000 (+1030)
Subject: configurator: Add test for glibc's qsort_r.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=4c00ae05fa9ccac14883c44de158620e301ff8e6

configurator: Add test for glibc's qsort_r.
---

diff --git a/config.h b/config.h
index f7dbc1f7..da831e08 100644
--- a/config.h
+++ b/config.h
@@ -35,6 +35,7 @@
 #define HAVE_LITTLE_ENDIAN 1
 #define HAVE_MEMMEM 1
 #define HAVE_MMAP 1
+#define HAVE_QSORT_R_PRIVATE_LAST 1
 #define HAVE_NESTED_FUNCTIONS 1
 #define HAVE_STACK_GROWS_UPWARDS 0
 #define HAVE_STATEMENT_EXPR 1
diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index f1c7088f..b316c786 100644
--- 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
 };
 
@@ -120,6 +121,19 @@ static struct test tests[] = {
 	  "static void *func(int fd) {\n"
 	  "	return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\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_NESTED_FUNCTIONS", DEFINES_FUNC, NULL,
 	  "void (*func(int val))(int);\n"
 	  "void (*func(int val))(int) {\n"
@@ -273,7 +287,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);
@@ -310,7 +324,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;