struct stat st;
str = grab_file(NULL, "test/run-grab.c", NULL);
+ /* FIXME: run_tests runs us from top level dir. Kill this */
+ if (!str)
+ str = grab_file(NULL, "ccan/grab_file/test/run-grab.c", NULL);
split = strsplit(NULL, str, "\n", NULL);
length = strlen(split[0]);
ok1(streq(split[0], "/* This is test for grab_file() function"));
length += strlen(split[i]);
ok1(streq(split[i-1], "/* End of grab_file() test */"));
if (stat("test/run-grab.c", &st) != 0)
- err(1, "Could not stat self");
+ /* FIXME: ditto */
+ if (stat("ccan/grab_file/test/run-grab.c", &st) != 0)
+ err(1, "Could not stat self");
ok1(st.st_size == length + i);
return 0;
return ret;
}
-static char *obj_list(void)
+static char *obj_list(const char *dir)
{
char *list = talloc_strdup(objs, "");
struct obj *i;
list = talloc_asprintf_append(list, "%s ", i->name);
/* FIXME */
- list = talloc_asprintf_append(list, "ccan/tap/tap.o");
+ if (!streq(dir, "tap") && !strends(dir, "/tap"))
+ list = talloc_asprintf_append(list, "ccan/tap/tap.o");
return list;
}
cmd = talloc_asprintf(name, "gcc " CFLAGS " %s -o %s %s %s %s%s %s",
fail ? "-DFAIL" : "",
- output_name(name), name, apiobj, obj_list(), libs,
- verbose ? "" : "> /dev/null 2>&1");
+ output_name(name), name, apiobj, obj_list(dir),
+ libs, verbose ? "" : "> /dev/null 2>&1");
if (verbose)
fprintf(stderr, "Running %s\n", cmd);
#define SPACE_CHARS " \f\n\r\t\v"
/* FIXME: Remove some -I */
-#define CFLAGS "-O -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan/ -I.. -I../.."
+#define CFLAGS "-O -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -Iccan/ -I. -I.. -I../.."
/* This actually compiles and runs the info file to get dependencies. */
char **get_deps(const void *ctx, const char *dir, const char *name,