X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=35e45ca03f26116b5584a34c5486cbc0a5d387a3;hp=5b0195d6ca2a526dd877f63bd8035a0798b915e6;hb=12652625db55f6586e95fc5edc73e1e85bae8a5c;hpb=2d4243996a4ace6d4eac1da460dd5bbcb31304ce

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 5b0195d6..35e45ca0 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -1,6 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
+#include <ccan/cast/cast.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -50,7 +51,7 @@ static void add_dep(struct manifest ***deps, const char *basename)
 
 	m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
 						ccan_dir, basename));
-	errstr = build_submodule(m);
+	errstr = build_submodule(m, cflags, COMPILE_NORMAL);
 	if (errstr)
 		errx(1, "%s", errstr);
 
@@ -61,7 +62,8 @@ static void add_dep(struct manifest ***deps, const char *basename)
 	if (m->info_file) {
 		char **infodeps;
 
-		infodeps = get_deps(m, m->dir, false, &m->info_file->compiled);
+		infodeps = get_deps(m, m->dir, false,
+				    &m->info_file->compiled[COMPILE_NORMAL]);
 
 		for (i = 0; infodeps[i]; i++) {
 			if (strstarts(infodeps[i], "ccan/"))
@@ -70,7 +72,7 @@ static void add_dep(struct manifest ***deps, const char *basename)
 	}
 }
 
-static char *obj_list(struct manifest *m, struct ccan_file *f)
+static char *example_obj_list(struct manifest *m, struct ccan_file *f)
 {
 	struct manifest **deps = talloc_array(f, struct manifest *, 0);
 	char **lines, *list;
@@ -95,19 +97,23 @@ static char *obj_list(struct manifest *m, struct ccan_file *f)
 
 	list = talloc_strdup(f, "");
 	for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++) {
-		if (deps[i]->compiled)
+		if (deps[i]->compiled[COMPILE_NORMAL])
 			list = talloc_asprintf_append(list, " %s",
-						      deps[i]->compiled);
+						      deps[i]->compiled
+						      [COMPILE_NORMAL]);
 	}
 	return list;
 }
 
+/* FIXME: Test with reduced features! */
 static char *lib_list(const struct manifest *m)
 {
 	unsigned int i, num;
-	char **libs = get_libs(m, m->dir, &num, &m->info_file->compiled);
+	char **libs;
 	char *ret = talloc_strdup(m, "");
 
+	libs = get_libs(m, m->dir, &num,
+			&m->info_file->compiled[COMPILE_NORMAL]);
 	for (i = 0; i < num; i++)
 		ret = talloc_asprintf_append(ret, "-l%s ", libs[i]);
 	return ret;
@@ -118,12 +124,18 @@ static bool compile(const void *ctx,
 		    struct ccan_file *file,
 		    bool keep, char **output)
 {
-	file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
+	file->compiled[COMPILE_NORMAL]
+		= maybe_temp_file(ctx, "", keep, file->fullname);
 	if (!compile_and_link(ctx, file->fullname, ccan_dir,
-			      obj_list(m, file),
-			      "", lib_list(m), file->compiled, output)) {
-		talloc_free(file->compiled);
-		file->compiled = NULL;
+			      example_obj_list(m, file),
+			      compiler, cflags,
+			      lib_list(m), file->compiled[COMPILE_NORMAL],
+			      output)) {
+		/* Don't keep failures. */
+		if (keep)
+			unlink(file->compiled[COMPILE_NORMAL]);
+		talloc_free(file->compiled[COMPILE_NORMAL]);
+		file->compiled[COMPILE_NORMAL] = NULL;
 		return false;
 	}
 	return true;
@@ -141,13 +153,13 @@ static char *start_main(char *ret, const char *why)
 static char *add_func(char *others, const char *line)
 {
 	const char *p, *end = strchr(line, '(') - 1;
-	while (isspace(*end)) {
+	while (cisspace(*end)) {
 		end--;
 		if (end == line)
 			return others;
 	}
 
-	for (p = end; isalnum(*p) || *p == '_'; p--) {
+	for (p = end; cisalnum(*p) || *p == '_'; p--) {
 		if (p == line)
 			return others;
 	}
@@ -184,48 +196,52 @@ static bool looks_internal(char **lines, char **why)
 		const char *line = lines[i] + strspn(lines[i], " \t");
 		unsigned len = strspn(line, IDENT_CHARS);
 
-		if (!line[0] || isspace(line[0]) || strstarts(line, "//"))
+		if (!line[0] || cisspace(line[0]) || strstarts(line, "//"))
 			continue;
 
 		/* The winners. */
 		if (strstarts(line, "if") && len == 2) {
-			*why = "starts with if";
+			*why = cast_const(char *, "starts with if");
 			return true;
 		}
 		if (strstarts(line, "for") && len == 3) {
-			*why = "starts with for";
+			*why = cast_const(char *, "starts with for");
 			return true;
 		}
 		if (strstarts(line, "while") && len == 5) {
-			*why = "starts with while";
+			*why = cast_const(char *, "starts with while");
 			return true;
 		}
 		if (strstarts(line, "do") && len == 2) {
-			*why = "starts with do";
+			*why = cast_const(char *, "starts with do");
 			return true;
 		}
 
 		/* The losers. */
 		if (strstarts(line, "#include")) {
-			*why = "starts with #include";
+			*why = cast_const(char *, "starts with #include");
 			return false;
 		}
 
 		if (last_ended && strchr(line, '(')) {
 			if (strstarts(line, "static")) {
-				*why = "starts with static and contains (";
+				*why = cast_const(char *,
+						  "starts with static"
+						  " and contains (");
 				return false;
 			}
 			if (strends(line, ")")) {
-				*why = "contains ( and ends with )";
+				*why = cast_const(char *,
+						  "contains ( and ends with )");
 				return false;
 			}
 		}
 
 		/* Single identifier then operator == inside function. */
 		if (last_ended && len
-		    && ispunct(line[len+strspn(line+len, " ")])) {
-			*why = "starts with identifier then punctuation";
+		    && cispunct(line[len+strspn(line+len, " ")])) {
+			*why = cast_const(char *, "starts with identifier"
+					  " then punctuation");
 			return true;
 		}
 
@@ -235,7 +251,7 @@ static bool looks_internal(char **lines, char **why)
 	}
 
 	/* No idea... Say yes? */
-	*why = "gave no clues";
+	*why = cast_const(char *, "gave no clues");
 	return true;
 }
 
@@ -310,23 +326,24 @@ static char *mangle(struct manifest *m, char **lines)
 	bool in_function = false, fake_function = false, has_main = false;
 	unsigned int i;
 
-	ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n"
-			    "#include <assert.h>\n"
-			    "#include <err.h>\n"
-			    "#include <errno.h>\n"
-			    "#include <fcntl.h>\n"
-			    "#include <limits.h>\n"
-			    "#include <stdbool.h>\n"
-			    "#include <stdint.h>\n"
-			    "#include <stdio.h>\n"
-			    "#include <stdlib.h>\n"
-			    "#include <string.h>\n"
-			    "#include <sys/stat.h>\n"
-			    "#include <sys/types.h>\n"
-			    "#include <unistd.h>\n");
-	ret = talloc_asprintf_append(ret, "/* Include header from module. */\n"
-				     "#include <ccan/%s/%s.h>\n",
-				     m->basename, m->basename);
+	ret = talloc_asprintf(m, 
+			      "/* Include header from module. */\n"
+			      "#include <ccan/%s/%s.h>\n"
+			      "/* Prepend a heap of headers. */\n"
+			      "#include <assert.h>\n"
+			      "#include <err.h>\n"
+			      "#include <errno.h>\n"
+			      "#include <fcntl.h>\n"
+			      "#include <limits.h>\n"
+			      "#include <stdbool.h>\n"
+			      "#include <stdint.h>\n"
+			      "#include <stdio.h>\n"
+			      "#include <stdlib.h>\n"
+			      "#include <string.h>\n"
+			      "#include <sys/stat.h>\n"
+			      "#include <sys/types.h>\n"
+			      "#include <unistd.h>\n",
+			      m->basename, m->basename);
 
 	ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
 				     "extern int somefunc(void);\n"
@@ -356,7 +373,7 @@ static char *mangle(struct manifest *m, char **lines)
 		} else {
 			/* Character at start of line, with ( and no ;
 			 * == function start.  Ignore comments. */
-			if (!isspace(line[0])
+			if (!cisspace(line[0])
 			    && strchr(line, '(')
 			    && !strchr(line, ';')
 			    && !strstr(line, "//")) {
@@ -516,7 +533,7 @@ static void build_examples(struct manifest *m, bool keep,
 		bool res[3];
 		unsigned num, j;
 		char **lines[3];
-		char *error;
+		const char *error;
 
 		score->total++;
 
@@ -542,25 +559,23 @@ static void build_examples(struct manifest *m, bool keep,
 					prev = lines[j];
 				score->score++;
 				warnings = true;
-				score->error = "Compiling extracted example"
-					" gave warnings";
-				error = talloc_asprintf(score,
-					"Example:\n"
-					"%s\n"
-					"Compiler:\n"
-					"%s",
-					get_ccan_file_contents(file[j]),
-					err[j]);
-				score_file_error(score, file[j], 0, error);
+				score_file_error(score, file[j], 0,
+						 "Compiling extracted example"
+						 " gave warnings:\n"
+						 "Example:\n"
+						 "%s\n"
+						 "Compiler:\n"
+						 "%s",
+						 get_ccan_file_contents(file[j]),
+						 err[j]);
 				goto next;
 			}
 		}
 
 		score->pass = false;
-		score->error = "Compiling extracted examples failed";
 		if (!verbose) {
 			if (num == 3)
-				error = "Standalone, adding headers, "
+				error = "Compiling standalone, adding headers, "
 					"and including previous "
 					"example all failed";
 			else
@@ -598,7 +613,7 @@ static void build_examples(struct manifest *m, bool keep,
 				      err[1]);
 			}
 		}
-		score_file_error(score, i, 0, error);
+		score_file_error(score, i, 0, "%s", error);
 		/* This didn't work, so not a candidate for combining. */
 		prev = NULL;
 
@@ -615,10 +630,11 @@ static void build_examples(struct manifest *m, bool keep,
 }
 
 struct ccanlint examples_compile = {
-	.key = "examples-compile",
+	.key = "examples_compile",
 	.name = "Module examples compile",
 	.check = build_examples,
 	.can_run = can_run,
+	.needs = "examples_exist module_builds"
 };
 
-REGISTER_TEST(examples_compile, &has_examples, &build, NULL);
+REGISTER_TEST(examples_compile);