#include <ccan/opt/opt.h>
#include <ccan/foreach/foreach.h>
#include <ccan/grab_file/grab_file.h>
+#include <ccan/cast/cast.h>
int verbose = 0;
static LIST_HEAD(compulsory_tests);
static unsigned int timeout;
/* These are overridden at runtime if we can find config.h */
-char *compiler = NULL;
-char *cflags = NULL;
+const char *compiler = NULL;
+const char *cflags = NULL;
const char *config_header;
printf("%s%s", score->error,
strends(score->error, "\n") ? "" : "\n");
}
- if (!quiet && !score->pass && i->handle)
- i->handle(m, score);
}
+ if (!quiet && score->score < score->total && i->handle)
+ i->handle(m, score);
*running_score += score->score;
*running_total += score->total;
static void register_test(struct list_head *h, struct ccanlint *test)
{
list_add(h, &test->list);
+ test->options = talloc_array(NULL, char *, 1);
+ test->options[0] = NULL;
}
/**
}
btree_delete(keys);
btree_delete(names);
+}
- if (!verbose)
- return;
+static void print_test_depends(void)
+{
+ struct list_head *list;
foreach_ptr(list, &compulsory_tests, &normal_tests) {
+ struct ccanlint *c;
printf("\%s Tests\n",
list == &compulsory_tests ? "Compulsory" : "Normal");
- if (!list_empty(&c->dependencies)) {
- const struct dependent *d;
- printf("These depend on us:\n");
- list_for_each(&c->dependencies, d, node)
- printf("\t%s\n", d->dependent->name);
+ list_for_each(list, c, list) {
+ if (!list_empty(&c->dependencies)) {
+ const struct dependent *d;
+ printf("These depend on %s:\n", c->key);
+ list_for_each(&c->dependencies, d, node)
+ printf("\t%s\n", d->dependent->key);
+ }
}
}
}
-static int show_tmpdir(char *dir)
+static int show_tmpdir(const char *dir)
{
printf("You can find ccanlint working files in '%s'\n", dir);
return 0;
if (lines[i][0])
lines[j++] = lines[i];
}
+ lines[j] = NULL;
if (nump)
*nump = j;
return lines;
}
+
+static void add_options(struct ccanlint *test, char **options,
+ unsigned int num_options)
+{
+ unsigned int num;
+
+ if (!test->options)
+ num = 0;
+ else
+ /* -1, because last one is NULL. */
+ num = talloc_array_length(test->options) - 1;
+
+ test->options = talloc_realloc(NULL, test->options,
+ char *,
+ num + num_options + 1);
+ memcpy(&test->options[num], options, (num_options + 1)*sizeof(char *));
+}
+
static void add_info_options(struct ccan_file *info, bool mark_fails)
{
struct doc_section *d;
continue;
for (i = 0; i < d->num_lines; i++) {
+ unsigned int num_words;
char **words = collapse(strsplit(d, d->lines[i], " \t"),
- NULL);
- if (!words[0])
+ &num_words);
+ if (num_words == 0)
continue;
if (strncmp(words[0], "//", 2) == 0)
if (!test->takes_options)
warnx("%s: %s doesn't take options",
info->fullname, words[0]);
- /* Copy line exactly into options. */
- test->options = strstr(d->lines[i], words[0])
- + strlen(words[0]);
+ add_options(test, words+1, num_words-1);
}
}
}
}
+/* If options are of form "filename:<option>" they only apply to that file */
+char **per_file_options(const struct ccanlint *test, struct ccan_file *f)
+{
+ char **ret;
+ unsigned int i, j = 0;
+
+ /* Fast path. */
+ if (!test->options[0])
+ return test->options;
+
+ ret = talloc_array(f, char *, talloc_array_length(test->options));
+ for (i = 0; test->options[i]; i++) {
+ char *optname;
+
+ if (!test->options[i] || !strchr(test->options[i], ':')) {
+ optname = test->options[i];
+ } else if (strstarts(test->options[i], f->name)
+ && test->options[i][strlen(f->name)] == ':') {
+ optname = test->options[i] + strlen(f->name) + 1;
+ } else
+ continue;
+
+ /* FAIL overrides anything else. */
+ if (streq(optname, "FAIL")) {
+ ret = talloc_array(f, char *, 2);
+ ret[0] = (char *)"FAIL";
+ ret[1] = NULL;
+ return ret;
+ }
+ ret[j++] = optname;
+ }
+ ret[j] = NULL;
+
+ /* Shrink it to size so talloc_array_length() works as expected. */
+ return talloc_realloc(NULL, ret, char *, j + 1);
+}
+
static bool depends_on(struct ccanlint *i, struct ccanlint *target)
{
const struct dependent *d;
if (string[i] == '\\') {
char repl;
unsigned len = 0;
- char *p = strchr(mapfrom, string[i+1]);
+ const char *p = strchr(mapfrom, string[i+1]);
if (p) {
repl = mapto[p - mapfrom];
len = 1;
repl = (string[i+2]-'0')*16
+ string[i+3]-'0';
len = 3;
- } else if (isdigit(string[i+1])) {
+ } else if (cisdigit(string[i+1])) {
repl = (string[i+2]-'0')*8*8
+ (string[i+3]-'0')*8
+ (string[i+4]-'0');
compiler = CCAN_CFLAGS;
}
+static char *opt_set_const_charp(const char *arg, const char **p)
+{
+ return opt_set_charp(arg, cast_const2(char **, p));
+}
+
int main(int argc, char *argv[])
{
- bool summary = false;
+ bool summary = false, pass = true;
unsigned int score = 0, total_score = 0;
struct manifest *m;
struct ccanlint *i;
opt_register_arg("--target <testname>", opt_set_charp,
NULL, &target,
"only run one test (and its prerequisites)");
- opt_register_arg("--compiler <compiler>", opt_set_charp,
+ opt_register_arg("--compiler <compiler>", opt_set_const_charp,
NULL, &compiler, "set the compiler");
- opt_register_arg("--cflags <flags>", opt_set_charp,
+ opt_register_arg("--cflags <flags>", opt_set_const_charp,
NULL, &cflags, "set the compiler flags");
opt_register_noarg("-?|-h|--help", opt_usage_and_exit,
"\nA program for checking and guiding development"
dir[strlen(dir)-1] = '\0';
if (dir != base_dir)
prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
- if (verbose >= 3)
+ if (verbose >= 3) {
compile_verbose = true;
+ print_test_depends();
+ }
if (verbose >= 4)
tools_verbose = true;
add_info_options(m->info_file, !target);
while ((i = get_next_test(&normal_tests)) != NULL)
- run_test(i, summary, &score, &total_score, m);
+ pass &= run_test(i, summary, &score, &total_score, m);
printf("%sTotal score: %u/%u\n", prefix, score, total_score);
- return 0;
+ return pass ? 0 : 1;
}
projects / ccan / blobdiff