Commit 0c532d80 authored by Rusty Russell's avatar Rusty Russell

More test fixes.

parent ad35219d
...@@ -18,14 +18,14 @@ main(int argc, char *argv[]) ...@@ -18,14 +18,14 @@ main(int argc, char *argv[])
int length; int length;
struct stat st; struct stat st;
str = grab_file(NULL, "ccan/grab_file/test/run-grab.c", NULL); str = grab_file(NULL, "test/run-grab.c", NULL);
split = strsplit(NULL, str, "\n", NULL); split = strsplit(NULL, str, "\n", NULL);
length = strlen(split[0]); length = strlen(split[0]);
ok1(streq(split[0], "/* This is test for grab_file() function")); ok1(streq(split[0], "/* This is test for grab_file() function"));
for (i = 1; split[i]; i++) for (i = 1; split[i]; i++)
length += strlen(split[i]); length += strlen(split[i]);
ok1(streq(split[i-1], "/* End of grab_file() test */")); ok1(streq(split[i-1], "/* End of grab_file() test */"));
if (stat("ccan/grab_file/test/run-grab.c", &st) != 0) if (stat("test/run-grab.c", &st) != 0)
err(1, "Could not stat self"); err(1, "Could not stat self");
ok1(st.st_size == length + i); ok1(st.st_size == length + i);
......
...@@ -123,7 +123,7 @@ static void handle_no_tests(struct manifest *m, void *check_result) ...@@ -123,7 +123,7 @@ static void handle_no_tests(struct manifest *m, void *check_result)
} }
struct ccanlint has_tests = { struct ccanlint has_tests = {
.name = "No tests", .name = "Has tests",
.check = check_has_tests, .check = check_has_tests,
.describe = describe_has_tests, .describe = describe_has_tests,
.handle = handle_no_tests, .handle = handle_no_tests,
......
...@@ -39,6 +39,10 @@ static char *obj_list(const struct manifest *m, bool link_with_module) ...@@ -39,6 +39,10 @@ static char *obj_list(const struct manifest *m, bool link_with_module)
if (link_with_module) if (link_with_module)
list = talloc_asprintf_append(list, " ../%s.o", m->basename); list = talloc_asprintf_append(list, " ../%s.o", m->basename);
/* Other ccan modules. */
list_for_each(&m->dep_objs, i, list)
list = talloc_asprintf_append(list, " %s", i->name);
return list; return list;
} }
......
...@@ -77,6 +77,8 @@ static const char *describe_run_tests(struct manifest *m, ...@@ -77,6 +77,8 @@ static const char *describe_run_tests(struct manifest *m,
return talloc_append_string(descrip, check_result); return talloc_append_string(descrip, check_result);
} }
/* FIXME: Handle by offering to run under debugger... */
struct ccanlint run_tests = { struct ccanlint run_tests = {
.name = "run and api tests run successfully", .name = "run and api tests run successfully",
.score = score_run_tests, .score = score_run_tests,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment