#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 */
-const char *compiler = CCAN_COMPILER;
-const char *cflags = CCAN_CFLAGS;
+const char *compiler = NULL;
+const char *cflags = NULL;
const char *config_header;
}
}
-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 (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');
if (!get_token(line, "define"))
continue;
sym = get_symbol_token(lines, line);
- if (streq(sym, "CCAN_COMPILER")) {
+ if (streq(sym, "CCAN_COMPILER") && !compiler) {
compiler = demangle_string(lines[i]);
+ if (!compiler)
+ errx(1, "%s:%u:could not parse CCAN_COMPILER",
+ fname, i+1);
if (verbose > 1)
printf("%s: compiler set to '%s'\n",
fname, compiler);
- } else if (streq(sym, "CCAN_CFLAGS")) {
+ } else if (streq(sym, "CCAN_CFLAGS") && !cflags) {
cflags = demangle_string(lines[i]);
+ if (!cflags)
+ errx(1, "%s:%u:could not parse CCAN_CFLAGS",
+ fname, i+1);
if (verbose > 1)
printf("%s: compiler flags set to '%s'\n",
fname, cflags);
}
}
- if (!compiler || !cflags)
- errx(1, "Problem parsing %s", fname);
+ if (!compiler)
+ compiler = CCAN_COMPILER;
+ if (!cflags)
+ 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[])
opt_register_arg("--target <testname>", opt_set_charp,
NULL, &target,
"only run one test (and its prerequisites)");
+ opt_register_arg("--compiler <compiler>", opt_set_const_charp,
+ NULL, &compiler, "set the compiler");
+ 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"
" of CCAN modules.",
}
/* --target overrides known FAIL from _info */
- add_info_options(m->info_file, !target);
+ if (m->info_file)
+ add_info_options(m->info_file, !target);
while ((i = get_next_test(&normal_tests)) != NULL)
run_test(i, summary, &score, &total_score, m);