X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=ce1d9769691d7ee6fa07736e33718f8deb2c55e5;hb=d379e0ae835bdd047a5d277f7ded41f180134e27;hp=6602c54683ed3b215dfa1dd9a5780267b11ba5cb;hpb=af5b1a18948345c5f9f9abf4eda3ab9fe0aa9a9f;p=ccan

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index 6602c546..ce1d9769 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -30,27 +30,27 @@ static void add_mod(struct manifest ***deps, struct manifest *m)
 	(*deps)[num] = m;
 }
 
-static bool have_mod(struct manifest *deps[], const char *basename)
+static bool have_mod(struct manifest *deps[], const char *modname)
 {
 	unsigned int i;
 
 	for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++)
-		if (strcmp(deps[i]->basename, basename) == 0)
+		if (strcmp(deps[i]->modname, modname) == 0)
 			return true;
 	return false;
 }
 
-static void add_dep(struct manifest ***deps, const char *basename)
+static void add_dep(struct manifest ***deps, const char *modname)
 {
 	unsigned int i;
 	struct manifest *m;
 	char *errstr;
 
-	if (have_mod(*deps, basename))
+	if (have_mod(*deps, modname))
 		return;
 
 	m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
-						ccan_dir, basename));
+						ccan_dir, modname));
 	errstr = build_submodule(m, cflags, COMPILE_NORMAL);
 	if (errstr)
 		errx(1, "%s", errstr);
@@ -62,8 +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[COMPILE_NORMAL]);
+		infodeps = get_deps(m, m->dir, "depends", false,
+				    get_or_compile_info);
 
 		for (i = 0; infodeps[i]; i++) {
 			if (strstarts(infodeps[i], "ccan/"))
@@ -72,14 +72,14 @@ static void add_dep(struct manifest ***deps, const char *basename)
 	}
 }
 
-static char *example_obj_list(struct manifest *m, struct ccan_file *f)
+static struct manifest **get_example_deps(struct manifest *m,
+					  struct ccan_file *f)
 {
+	char **lines;
 	struct manifest **deps = talloc_array(f, struct manifest *, 0);
-	char **lines, *list;
-	unsigned int i;
 
 	/* This one for a start. */
-	add_dep(&deps, m->basename);
+	add_dep(&deps, m->modname);
 
 	/* Other modules implied by includes. */
 	for (lines = get_ccan_file_lines(f); *lines; lines++) {
@@ -95,8 +95,15 @@ 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++) {
+	return deps;
+}
+
+static char *example_obj_list(const void *ctx, struct manifest **deps)
+{
+	char *list = talloc_strdup(ctx, "");
+	unsigned int i;
+
+	for (i = 0; i < talloc_array_length(deps); i++) {
 		if (deps[i]->compiled[COMPILE_NORMAL])
 			list = talloc_asprintf_append(list, " %s",
 						      deps[i]->compiled
@@ -105,30 +112,35 @@ static char *example_obj_list(struct manifest *m, struct ccan_file *f)
 	return list;
 }
 
-/* FIXME: Test with reduced features! */
-static char *lib_list(const struct manifest *m)
+static char *example_lib_list(const void *ctx, struct manifest **deps)
 {
-	unsigned int i, num;
+	char *list = talloc_strdup(ctx, "");
 	char **libs;
-	char *ret = talloc_strdup(m, "");
+	unsigned int i, j;
 
-	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;
+	/* FIXME: This doesn't uniquify. */
+	for (i = 0; i < talloc_array_length(deps); i++) {
+		libs = get_libs(ctx, deps[i]->dir, NULL, get_or_compile_info);
+		for (j = 0; libs[j]; j++)
+			list = talloc_asprintf_append(list, "-l%s ", libs[j]);
+	}
+	return list;
 }
 
+/* FIXME: Test with reduced features! */
 static bool compile(const void *ctx,
 		    struct manifest *m,
 		    struct ccan_file *file,
 		    char **output)
 {
+	struct manifest **deps = get_example_deps(m, file);
+
 	file->compiled[COMPILE_NORMAL] = temp_file(ctx, "", file->fullname);
 	if (!compile_and_link(ctx, file->fullname, ccan_dir,
-			      example_obj_list(m, file),
+			      example_obj_list(file, deps),
 			      compiler, cflags,
-			      lib_list(m), file->compiled[COMPILE_NORMAL],
+			      example_lib_list(file, deps),
+			      file->compiled[COMPILE_NORMAL],
 			      output)) {
 		/* Don't keep failures, even with --keep */
 		unlink(file->compiled[COMPILE_NORMAL]);
@@ -193,7 +205,8 @@ 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] || cisspace(line[0]) || strstarts(line, "//"))
+		if (!line[0] || cisspace(line[0]) || strstarts(line, "//")
+		    || strstarts(line, "#line"))
 			continue;
 
 		assert(line[strlen(line)-1] != '\n');
@@ -349,7 +362,7 @@ static char *mangle(struct manifest *m, char **lines)
 			      "#include <sys/stat.h>\n"
 			      "#include <sys/types.h>\n"
 			      "#include <unistd.h>\n",
-			      m->basename, m->basename);
+			      m->modname, m->basename);
 
 	ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
 				     "extern int somefunc(void);\n"