#include <tools/ccanlint/ccanlint.h>
#include <tools/tools.h>
#include <ccan/talloc/talloc.h>
+#include <ccan/cast/cast.h>
#include <ccan/str/str.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <ctype.h>
#include <assert.h>
+#include <err.h>
+#include "../compulsory_tests/build.h"
static const char *can_run(struct manifest *m)
{
return NULL;
}
-/* FIXME: We should build if it doesn't exist... */
-static bool expect_obj_file(const char *dir)
+static void add_mod(struct manifest ***deps, struct manifest *m)
{
- struct manifest *dep_man;
- bool has_c_files;
-
- dep_man = get_manifest(dir, dir);
-
- /* If it has C files, we expect an object file built from them. */
- has_c_files = !list_empty(&dep_man->c_files);
- talloc_free(dep_man);
- return has_c_files;
+ unsigned int num = talloc_get_size(*deps) / sizeof(*deps);
+ *deps = talloc_realloc(NULL, *deps, struct manifest *, num + 1);
+ (*deps)[num] = m;
}
-static char *add_dep(const struct manifest *m, char *list, const char *mod)
+static bool have_mod(struct manifest *deps[], const char *basename)
{
- char **deps, *obj;
unsigned int i;
- /* Not ourselves. */
- if (streq(m->basename, mod))
- return list;
+ for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++)
+ if (strcmp(deps[i]->basename, basename) == 0)
+ return true;
+ return false;
+}
- /* Not if there's no object file for that module */
- if (!expect_obj_file(talloc_asprintf(list, "%s/ccan/%s", ccan_dir,mod)))
- return list;
+static void add_dep(struct manifest ***deps, const char *basename)
+{
+ unsigned int i;
+ struct manifest *m;
+ char *errstr;
- obj = talloc_asprintf(list, "%s/ccan/%s.o", ccan_dir, mod);
+ if (have_mod(*deps, basename))
+ return;
- /* Not anyone we've already included. */
- if (strstr(list, obj))
- return list;
+ m = get_manifest(*deps, talloc_asprintf(*deps, "%s/ccan/%s",
+ ccan_dir, basename));
+ errstr = build_submodule(m);
+ if (errstr)
+ errx(1, "%s", errstr);
- list = talloc_asprintf_append(list, " %s", obj);
+ add_mod(deps, m);
/* Get that modules depends as well... */
assert(!safe_mode);
- deps = get_deps(m, talloc_asprintf(list, "%s/ccan/%s", ccan_dir, mod),
- false, NULL);
+ if (m->info_file) {
+ char **infodeps;
+
+ infodeps = get_deps(m, m->dir, false, &m->info_file->compiled);
- for (i = 0; deps[i]; i++) {
- if (strstarts(deps[i], "ccan/"))
- list = add_dep(m, list, deps[i] + strlen("ccan/"));
+ for (i = 0; infodeps[i]; i++) {
+ if (strstarts(infodeps[i], "ccan/"))
+ add_dep(deps, infodeps[i] + strlen("ccan/"));
+ }
}
- return list;
}
-/* FIXME: Merge this into one place. */
-static char *obj_list(const struct manifest *m, struct ccan_file *f)
+static char *obj_list(struct manifest *m, struct ccan_file *f)
{
- char *list = talloc_strdup(m, "");
- struct manifest *subm;
- char **lines;
+ struct manifest **deps = talloc_array(f, struct manifest *, 0);
+ char **lines, *list;
+ unsigned int i;
- /* This module. */
- if (m->compiled)
- list = talloc_asprintf_append(list, " %s", m->compiled);
-
- /* Other ccan modules we depend on. */
- list_for_each(&m->deps, subm, list) {
- if (subm->compiled)
- list = talloc_asprintf_append(list, " %s",
- subm->compiled);
- }
+ /* This one for a start. */
+ add_dep(&deps, m->basename);
/* Other modules implied by includes. */
for (lines = get_ccan_file_lines(f); *lines; lines++) {
unsigned preflen = strspn(*lines, " \t");
if (strstarts(*lines + preflen, "#include <ccan/")) {
- const char *mod;
- unsigned modlen;
+ char *modname;
- mod = *lines + preflen + strlen("#include <ccan/");
- modlen = strcspn(mod, "/");
- mod = talloc_strndup(f, mod, modlen);
- list = add_dep(m, list, mod);
+ modname = talloc_strdup(f, *lines + preflen
+ + strlen("#include <ccan/"));
+ modname[strcspn(modname, "/")] = '\0';
+ if (!have_mod(deps, modname))
+ add_dep(&deps, modname);
}
}
+ list = talloc_strdup(f, "");
+ for (i = 0; i < talloc_get_size(deps) / sizeof(*deps); i++) {
+ if (deps[i]->compiled)
+ list = talloc_asprintf_append(list, " %s",
+ deps[i]->compiled);
+ }
return list;
}
file->compiled = maybe_temp_file(ctx, "", keep, file->fullname);
if (!compile_and_link(ctx, file->fullname, ccan_dir,
obj_list(m, file),
- "", lib_list(m), file->compiled, output)) {
+ compiler, cflags,
+ lib_list(m), file->compiled, output)) {
+ /* Don't keep failures. */
+ if (keep)
+ unlink(file->compiled);
talloc_free(file->compiled);
file->compiled = NULL;
return false;
static char *add_func(char *others, const char *line)
{
const char *p, *end = strchr(line, '(') - 1;
- while (isspace(*end)) {
+ while (cisspace(*end)) {
end--;
if (end == line)
return others;
}
- for (p = end; isalnum(*p) || *p == '_'; p--) {
+ for (p = end; cisalnum(*p) || *p == '_'; p--) {
if (p == line)
return others;
}
const char *line = lines[i] + strspn(lines[i], " \t");
unsigned len = strspn(line, IDENT_CHARS);
- if (!line[0] || isspace(line[0]) || strstarts(line, "//"))
+ if (!line[0] || cisspace(line[0]) || strstarts(line, "//"))
continue;
/* The winners. */
if (strstarts(line, "if") && len == 2) {
- *why = "starts with if";
+ *why = cast_const(char *, "starts with if");
return true;
}
if (strstarts(line, "for") && len == 3) {
- *why = "starts with for";
+ *why = cast_const(char *, "starts with for");
return true;
}
if (strstarts(line, "while") && len == 5) {
- *why = "starts with while";
+ *why = cast_const(char *, "starts with while");
return true;
}
if (strstarts(line, "do") && len == 2) {
- *why = "starts with do";
+ *why = cast_const(char *, "starts with do");
return true;
}
/* The losers. */
if (strstarts(line, "#include")) {
- *why = "starts with #include";
+ *why = cast_const(char *, "starts with #include");
return false;
}
if (last_ended && strchr(line, '(')) {
if (strstarts(line, "static")) {
- *why = "starts with static and contains (";
+ *why = cast_const(char *,
+ "starts with static"
+ " and contains (");
return false;
}
if (strends(line, ")")) {
- *why = "contains ( and ends with )";
+ *why = cast_const(char *,
+ "contains ( and ends with )");
return false;
}
}
/* Single identifier then operator == inside function. */
if (last_ended && len
- && ispunct(line[len+strspn(line+len, " ")])) {
- *why = "starts with identifier then punctuation";
+ && cispunct(line[len+strspn(line+len, " ")])) {
+ *why = cast_const(char *, "starts with identifier"
+ " then punctuation");
return true;
}
}
/* No idea... Say yes? */
- *why = "gave no clues";
+ *why = cast_const(char *, "gave no clues");
return true;
}
return ret;
}
+/* Only handles very simple comments. */
+static char *strip_comment(const void *ctx, const char *orig_line)
+{
+ char *p, *ret = talloc_strdup(ctx, orig_line);
+
+ p = strstr(ret, "/*");
+ if (!p)
+ p = strstr(ret, "//");
+ if (p)
+ *p = '\0';
+ return ret;
+}
+
static char *mangle(struct manifest *m, char **lines)
{
char *ret, *use_funcs = NULL, *why;
bool in_function = false, fake_function = false, has_main = false;
unsigned int i;
- ret = talloc_strdup(m, "/* Prepend a heap of headers. */\n"
- "#include <assert.h>\n"
- "#include <err.h>\n"
- "#include <errno.h>\n"
- "#include <fcntl.h>\n"
- "#include <limits.h>\n"
- "#include <stdbool.h>\n"
- "#include <stdint.h>\n"
- "#include <stdio.h>\n"
- "#include <stdlib.h>\n"
- "#include <string.h>\n"
- "#include <sys/stat.h>\n"
- "#include <sys/types.h>\n"
- "#include <unistd.h>\n");
- ret = talloc_asprintf_append(ret, "/* Include header from module. */\n"
- "#include <ccan/%s/%s.h>\n",
- m->basename, m->basename);
+ ret = talloc_asprintf(m,
+ "/* Include header from module. */\n"
+ "#include <ccan/%s/%s.h>\n"
+ "/* Prepend a heap of headers. */\n"
+ "#include <assert.h>\n"
+ "#include <err.h>\n"
+ "#include <errno.h>\n"
+ "#include <fcntl.h>\n"
+ "#include <limits.h>\n"
+ "#include <stdbool.h>\n"
+ "#include <stdint.h>\n"
+ "#include <stdio.h>\n"
+ "#include <stdlib.h>\n"
+ "#include <string.h>\n"
+ "#include <sys/stat.h>\n"
+ "#include <sys/types.h>\n"
+ "#include <unistd.h>\n",
+ m->basename, m->basename);
ret = talloc_asprintf_append(ret, "/* Useful dummy functions. */\n"
"extern int somefunc(void);\n"
/* Primitive, very primitive. */
for (i = 0; lines[i]; i++) {
+ char *line = strip_comment(ret, lines[i]);
+
/* } at start of line ends a function. */
if (in_function) {
- if (lines[i][0] == '}')
+ if (line[0] == '}')
in_function = false;
} else {
/* Character at start of line, with ( and no ;
* == function start. Ignore comments. */
- if (!isspace(lines[i][0])
- && strchr(lines[i], '(')
- && !strchr(lines[i], ';')
- && !strstr(lines[i], "//")) {
+ if (!cisspace(line[0])
+ && strchr(line, '(')
+ && !strchr(line, ';')
+ && !strstr(line, "//")) {
in_function = true;
- if (strncmp(lines[i], "int main", 8) == 0)
+ if (strncmp(line, "int main", 8) == 0)
has_main = true;
- if (strncmp(lines[i], "static", 6) == 0) {
+ if (strncmp(line, "static", 6) == 0) {
use_funcs = add_func(use_funcs,
- lines[i]);
+ line);
}
}
}
/* ... means elided code. */
- if (strcmp(lines[i], "...") == 0) {
+ if (strcmp(line, "...") == 0) {
if (!in_function && !has_main
&& looks_internal(lines + i + 1, &why)) {
/* This implies we start a function here. */
bool res[3];
unsigned num, j;
char **lines[3];
- char *error;
+ const char *error;
score->total++;
prev = lines[j];
score->score++;
warnings = true;
- score->error = "Compiling extracted example"
- " gave warnings";
- error = talloc_asprintf(score,
- "Example:\n"
- "%s\n"
- "Compiler:\n"
- "%s",
- get_ccan_file_contents(file[j]),
- err[j]);
- score_file_error(score, file[j], 0, error);
+ score_file_error(score, file[j], 0,
+ "Compiling extracted example"
+ " gave warnings:\n"
+ "Example:\n"
+ "%s\n"
+ "Compiler:\n"
+ "%s",
+ get_ccan_file_contents(file[j]),
+ err[j]);
goto next;
}
}
score->pass = false;
- score->error = "Compiling extracted examples failed";
if (!verbose) {
if (num == 3)
- error = "Standalone, adding headers, "
+ error = "Compiling standalone, adding headers, "
"and including previous "
"example all failed";
else
err[1]);
}
}
- score_file_error(score, i, 0, error);
+ score_file_error(score, i, 0, "%s", error);
/* This didn't work, so not a candidate for combining. */
prev = NULL;
}
struct ccanlint examples_compile = {
- .key = "examples-compile",
+ .key = "examples_compile",
.name = "Module examples compile",
.check = build_examples,
.can_run = can_run,
+ .needs = "examples_exist module_builds"
};
-REGISTER_TEST(examples_compile, &has_examples, &build, NULL);
+REGISTER_TEST(examples_compile);
projects / ccan / blobdiff