X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=59dd40fd9d4c04585b990fd1b0772c4b27d87352;hp=f58dddf241b377c5d99a433abfb5df4e765955a4;hb=6e1cdb3d8b6fac56b24403e2d0b86810a9ccffb2;hpb=a40b318e7a07a452ae7456053727bd11b2fa49b4

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index f58dddf2..59dd40fd 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -4,6 +4,8 @@
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/noerr/noerr.h>
+#include <ccan/foreach/foreach.h>
+#include <ccan/asort/asort.h>
 #include "../tools.h"
 #include <unistd.h>
 #include <sys/types.h>
@@ -139,13 +141,39 @@ static void add_files(struct manifest *m, const char *dir)
 	closedir(d);
 }
 
+static int cmp_names(struct ccan_file *const *a, struct ccan_file *const *b,
+		     void *unused)
+{
+	return strcmp((*a)->name, (*b)->name);
+}
+
+static void sort_files(struct list_head *list)
+{
+	struct ccan_file **files = NULL, *f;
+	unsigned int i, num;
+
+	num = 0;
+	while ((f = list_top(list, struct ccan_file, list)) != NULL) {
+		files = talloc_realloc(NULL, files, struct ccan_file *, num+1);
+		files[num++] = f;
+		list_del(&f->list);
+	}
+	asort(files, num, cmp_names, NULL);
+
+	for (i = 0; i < num; i++)
+		list_add_tail(list, &files[i]->list);
+	talloc_free(files);
+}
+
 struct manifest *get_manifest(const void *ctx, const char *dir)
 {
 	struct manifest *m = talloc(ctx, struct manifest);
 	char *olddir;
 	unsigned int len;
+	struct list_head *list;
 
 	m->info_file = NULL;
+	m->compiled = NULL;
 	list_head_init(&m->c_files);
 	list_head_init(&m->h_files);
 	list_head_init(&m->api_tests);
@@ -157,7 +185,7 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 	list_head_init(&m->other_files);
 	list_head_init(&m->examples);
 	list_head_init(&m->mangled_examples);
-	list_head_init(&m->dep_dirs);
+	list_head_init(&m->deps);
 
 	olddir = talloc_getcwd(NULL);
 	if (!olddir)
@@ -191,6 +219,11 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 
 	add_files(m, "");
 
+	/* Nicer to run tests in a predictable order. */
+	foreach_ptr(list, &m->api_tests, &m->run_tests, &m->compile_ok_tests,
+		    &m->compile_fail_tests)
+		sort_files(list);
+
 	if (chdir(olddir) != 0)
 		err(1, "Returning to original directory '%s'", olddir);
 	talloc_free(olddir);
@@ -557,5 +590,5 @@ void score_file_error(struct score *score, struct ccan_file *f, unsigned line,
 	fe->file = f;
 	fe->line = line;
 	fe->error = error;
-	list_add(&score->per_file_errors, &fe->list);
+	list_add_tail(&score->per_file_errors, &fe->list);
 }