X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=a590a8d4f947c402b086e90adef3e23414b1da66;hb=1b7100ad101992adeaeb5c4ab85ee9a1b368b842;hp=fe1611e4b525312e8f5dbbccadaaa4eac56eb28d;hpb=b2be425ed39cce4d0af29952607362fa05e48079;p=ccan

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index fe1611e4..a590a8d4 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -55,6 +55,7 @@ struct test {
 	const char *depends;
 	const char *link;
 	const char *fragment;
+	const char *flags;
 	const char *overrides; /* On success, force this to '1' */
 	bool done;
 	bool answer;
@@ -310,6 +311,14 @@ static struct test tests[] = {
 	  "static __attribute__((warn_unused_result)) int func(int i) {\n"
 	  "	return i + 1;\n"
 	  "}" },
+	{ "HAVE_OPENMP", INSIDE_MAIN, NULL, NULL,
+	  "int i;\n"
+	  "#pragma omp parallel for\n"
+	  "for(i = 0; i < 0; i++) {};\n"
+	  "return 0;\n",
+	  "-Werror -fopenmp" },
+	{ "HAVE_VALGRIND_MEMCHECK_H", OUTSIDE_MAIN, NULL, NULL,
+	  "#include <valgrind/memcheck.h>\n" },
 };
 
 static char *grab_fd(int fd)
@@ -415,7 +424,7 @@ static struct test *find_test(const char *name)
 
 static bool run_test(const char *cmd, struct test *test)
 {
-	char *output;
+	char *output, *newcmd;
 	FILE *outf;
 	int status;
 
@@ -490,17 +499,30 @@ static bool run_test(const char *cmd, struct test *test)
 	if (verbose > 1)
 		if (system("cat " INPUT_FILE) == -1);
 
+	newcmd = strdup(cmd);
+
+	if (test->flags) {
+		newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
+				+ strlen(test->flags) + 1);
+		strcat(newcmd, " ");
+		strcat(newcmd, test->flags);
+		if (verbose > 1)
+			printf("Extra flags line: %s", newcmd);
+	}
+
 	if (test->link) {
-		char *newcmd;
-		newcmd = malloc(strlen(cmd) + strlen(" ")
+		newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
 				+ strlen(test->link) + 1);
-		sprintf(newcmd, "%s %s", cmd, test->link);
+		strcat(newcmd, " ");
+		strcat(newcmd, test->link);
 		if (verbose > 1)
 			printf("Extra link line: %s", newcmd);
-		cmd = newcmd;
 	}
 
-	output = run(cmd, &status);
+	output = run(newcmd, &status);
+
+	free(newcmd);
+
 	if (status != 0 || strstr(output, "warning")) {
 		if (verbose)
 			printf("Compile %s for %s, status %i: %s\n",