#include <dirent.h>
#include <ctype.h>
#include <stdarg.h>
+#include <assert.h>
+
+const char *ccan_dir;
+
+const char *get_ccan_file_contents(struct ccan_file *f)
+{
+ if (!f->contents) {
+ f->contents = grab_file(f, f->fullname, &f->contents_size);
+ if (!f->contents)
+ err(1, "Reading file %s", f->fullname);
+ }
+ return f->contents;
+}
char **get_ccan_file_lines(struct ccan_file *f)
{
if (!f->lines)
- f->lines = strsplit(f, f->contents, "\n", &f->num_lines);
+ f->lines = strsplit(f, get_ccan_file_contents(f),
+ "\n", &f->num_lines);
return f->lines;
}
return f->doc_sections;
}
-struct ccan_file *new_ccan_file(const void *ctx, char *name)
+struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
{
struct ccan_file *f;
+ assert(dir[0] == '/');
+
f = talloc(ctx, struct ccan_file);
f->lines = NULL;
f->line_info = NULL;
f->doc_sections = NULL;
+ f->compiled = NULL;
f->name = talloc_steal(f, name);
+ f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name);
+ f->contents = NULL;
+ f->cov_compiled = NULL;
return f;
}
if (ent->d_name[0] == '.')
continue;
- f = new_ccan_file(m, talloc_asprintf(m, "%s%s",
- dir, ent->d_name));
+ f = new_ccan_file(m, m->dir,
+ talloc_asprintf(m, "%s%s",
+ dir, ent->d_name));
if (lstat(f->name, &st) != 0)
err(1, "lstat %s", f->name);
if (streq(f->name, "_info")) {
m->info_file = f;
- f->contents = grab_file(f, f->name, &f->contents_size);
- if (!f->contents)
- err(1, "Reading file %s", f->name);
continue;
}
is_c_src = strends(f->name, ".c");
if (!is_c_src && !strends(f->name, ".h")) {
- /* We don't pull in contents of non-source files */
dest = &m->other_files;
continue;
}
- f->contents = grab_file(f, f->name, &f->contents_size);
- if (!f->contents)
- err(1, "Reading file %s", f->name);
-
if (!strchr(f->name, '/')) {
if (is_c_src)
dest = &m->c_files;
else if (strstarts(f->name, "test/compile_fail"))
dest = &m->compile_fail_tests;
else
- dest = &m->other_test_files;
+ dest = &m->other_test_c_files;
} else
dest = &m->other_test_files;
} else
closedir(d);
}
-char *report_on_lines(struct list_head *files,
- char *(*report)(const char *),
- char *sofar)
-{
- struct ccan_file *f;
-
- list_for_each(files, f, list) {
- unsigned int i;
- char **lines = get_ccan_file_lines(f);
-
- for (i = 0; i < f->num_lines; i++) {
- char *r = report(lines[i]);
- if (!r)
- continue;
-
- sofar = talloc_asprintf_append(sofar,
- "%s:%u:%s\n",
- f->name, i+1, r);
- talloc_free(r);
- }
- }
- return sofar;
-}
-
-struct manifest *get_manifest(const void *ctx)
+struct manifest *get_manifest(const void *ctx, const char *dir)
{
struct manifest *m = talloc(ctx, struct manifest);
+ char *olddir;
unsigned int len;
m->info_file = NULL;
list_head_init(&m->run_tests);
list_head_init(&m->compile_ok_tests);
list_head_init(&m->compile_fail_tests);
+ list_head_init(&m->other_test_c_files);
list_head_init(&m->other_test_files);
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->dep_objs);
- m->basename = talloc_getcwd(m);
- if (!m->basename)
+ olddir = talloc_getcwd(NULL);
+ if (!olddir)
err(1, "Getting current directory");
- len = strlen(m->basename);
- while (len && m->basename[len-1] == '/')
- m->basename[--len] = '\0';
- m->basename = strrchr(m->basename, '/');
+ if (chdir(dir) != 0)
+ err(1, "Failed to chdir to %s", dir);
+
+ m->dir = talloc_getcwd(m);
+ if (!m->dir)
+ err(1, "Getting current directory");
+
+ len = strlen(m->dir);
+ while (len && m->dir[len-1] == '/')
+ m->dir[--len] = '\0';
+
+ m->basename = strrchr(m->dir, '/');
if (!m->basename)
errx(1, "I don't expect to be run from the root directory");
m->basename++;
+ /* We expect the ccan dir to be two levels above module dir. */
+ if (!ccan_dir) {
+ char *p;
+ ccan_dir = talloc_strdup(NULL, m->dir);
+ p = strrchr(ccan_dir, '/');
+ *p = '\0';
+ p = strrchr(ccan_dir, '/');
+ *p = '\0';
+ }
+
add_files(m, "");
+
+ if (chdir(olddir) != 0)
+ err(1, "Returning to original directory '%s'", olddir);
+ talloc_free(olddir);
+
return m;
}
return ret;
}
+void score_file_error(struct score *score, struct ccan_file *f, unsigned line,
+ const char *error)
+{
+ struct file_error *fe = talloc(score, struct file_error);
+ fe->file = f;
+ fe->line = line;
+ fe->error = error;
+ list_add_tail(&score->per_file_errors, &fe->list);
+}