X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=3cbb23fd024db87249408ea5950bf3e753b85af1;hb=64bd9ff9bc3e65bb0e77b982135d6612cda180cd;hp=646e5ae3325a575f94e83ab496fcef66792016a6;hpb=271676fecdb2fb079374b9e3fe03e5c53e7f0f23;p=ccan

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 646e5ae3..3cbb23fd 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include <err.h>
-#include "../compulsory_tests/build.h"
+#include "build.h"
 
 static const char *can_run(struct manifest *m)
 {
@@ -51,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);
 
@@ -62,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/"))
@@ -96,19 +97,23 @@ static char *example_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;
@@ -119,16 +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,
 			      example_obj_list(m, file),
 			      compiler, cflags,
-			      lib_list(m), file->compiled, output)) {
+			      lib_list(m), file->compiled[COMPILE_NORMAL],
+			      output)) {
 		/* Don't keep failures. */
 		if (keep)
-			unlink(file->compiled);
-		talloc_free(file->compiled);
-		file->compiled = NULL;
+			unlink(file->compiled[COMPILE_NORMAL]);
+		talloc_free(file->compiled[COMPILE_NORMAL]);
+		file->compiled[COMPILE_NORMAL] = NULL;
 		return false;
 	}
 	return true;
@@ -192,6 +199,8 @@ static bool looks_internal(char **lines, char **why)
 		if (!line[0] || cisspace(line[0]) || strstarts(line, "//"))
 			continue;
 
+		assert(line[strlen(line)-1] != '\n');
+
 		/* The winners. */
 		if (strstarts(line, "if") && len == 2) {
 			*why = cast_const(char *, "starts with if");
@@ -230,6 +239,12 @@ static bool looks_internal(char **lines, char **why)
 			}
 		}
 
+		/* Previously prepended. */
+		if (strstr(line, "didn't seem to belong inside a function")) {
+			*why = cast_const(char *, "Comment said so");
+			return false;
+		}
+
 		/* Single identifier then operator == inside function. */
 		if (last_ended && len
 		    && cispunct(line[len+strspn(line+len, " ")])) {
@@ -240,6 +255,7 @@ static bool looks_internal(char **lines, char **why)
 
 		last_ended = (strends(line, "}")
 			      || strends(line, ";")
+			      || strends(line, "*/")
 			      || streq(line, "..."));
 	}
 
@@ -291,7 +307,7 @@ static char **combine(const void *ctx, char **lines, char **prev)
 	prev_total = i;
 
 	ret = talloc_array(ctx, char *, 1 +lines_total + prev_total + 1);
-	ret[0] = talloc_asprintf(ret, "/* The example %s, thus %s */\n",
+	ret[0] = talloc_asprintf(ret, "/* The example %s, thus %s */",
 				 why, reasoning);
 	memcpy(ret+1, lines, count * sizeof(ret[0]));
 	memcpy(ret+1 + count, prev, prev_total * sizeof(ret[0]));