X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=7ebb411c0c9f6eb664991da10e75b7fb684a64c3;hp=9df3a7fb67eda09dd861a53213662d370fc54752;hb=5c6c8ea8ca66fe70563143cb226852a10b1a98fb;hpb=ac319778b407636ae5b0ecf9d75e85752014ef96 diff --git a/test/parser/utils.c b/test/parser/utils.c index 9df3a7f..7ebb411 100644 --- a/test/parser/utils.c +++ b/test/parser/utils.c @@ -17,36 +17,46 @@ #include "parser-test.h" -static int n_parsers; -static struct parser **parsers; +struct p_item { + struct list_item list; + struct parser *parser; +}; + +STATIC_LIST(parsers); void __register_parser(struct parser *parser) { - parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1); - parsers[n_parsers] = parser; - n_parsers++; + struct p_item* i = talloc(NULL, struct p_item); + + i->parser = parser; + list_add(&parsers, &i->list); +} + +static void __attribute__((destructor)) __cleanup_parsers(void) +{ + struct p_item *item, *tmp; + + list_for_each_entry_safe(&parsers, item, tmp, list) + talloc_free(item); } static struct discover_device *test_create_device_simple( - struct discover_context *ctx) + struct parser_test *test) { static int dev_idx; char name[10]; sprintf(name, "__test%d", dev_idx++); - return test_create_device(ctx, name); + return test_create_device(test, name); } -struct discover_device *test_create_device(struct discover_context *ctx, +struct discover_device *test_create_device(struct parser_test *test, const char *name) { struct discover_device *dev; - dev = talloc_zero(ctx, struct discover_device); - dev->device = talloc_zero(dev, struct device); - - list_init(&dev->boot_options); + dev = discover_device_create(test->handler, name); dev->device->id = talloc_strdup(dev, name); dev->device_path = talloc_asprintf(dev, "/dev/%s", name); @@ -63,17 +73,21 @@ static struct discover_context *test_create_context(struct parser_test *test) assert(ctx); list_init(&ctx->boot_options); - ctx->device = test_create_device_simple(ctx); + ctx->device = test_create_device_simple(test); + device_handler_add_device(test->handler, ctx->device); return ctx; } +extern struct config *test_config_init(struct parser_test *test); + struct parser_test *test_init(void) { struct parser_test *test; test = talloc_zero(NULL, struct parser_test); - test->handler = device_handler_init(NULL, 0); + test->config = test_config_init(test); + test->handler = device_handler_init(NULL, NULL, 0); test->ctx = test_create_context(test); return test; @@ -120,25 +134,24 @@ void test_read_conf_file(struct parser_test *test, const char *filename) talloc_free(path); } +void test_set_conf_source(struct parser_test *test, const char *url) +{ + test->ctx->conf_url = pb_url_parse(test, url); + assert(test->ctx->conf_url); +} + int test_run_parser(struct parser_test *test, const char *parser_name) { - struct parser *parser; - int i, rc = 0; + struct p_item* i; - for (i = 0; i < n_parsers; i++) { - parser = parsers[i]; - if (strcmp(parser->name, parser_name)) + list_for_each_entry(&parsers, i, list) { + if (strcmp(i->parser->name, parser_name)) continue; - test->ctx->parser = parser; - rc = parser->parse(test->ctx, test->conf.buf, test->conf.size); - break; + test->ctx->parser = i->parser; + return i->parser->parse(test->ctx, test->conf.buf, test->conf.size); } - if (i == n_parsers) - errx(EXIT_FAILURE, "%s: parser '%s' not found", - __func__, parser_name); - - return rc; + errx(EXIT_FAILURE, "%s: parser '%s' not found", __func__, parser_name); } bool resource_resolve(struct device_handler *handler, struct parser *parser, @@ -163,9 +176,6 @@ void boot_option_resolve(struct device_handler *handler, resource_resolve(handler, opt->source, opt->icon); } -extern void device_handler_add_device(struct device_handler *handler, - struct discover_device *dev); - void test_hotplug_device(struct parser_test *test, struct discover_device *dev) { struct discover_boot_option *opt; @@ -196,10 +206,19 @@ void __check_boot_option_count(struct discover_context *ctx, int count, const char *file, int line) { struct discover_boot_option *opt; - int i = 0; + int defaults = 0, i = 0; - list_for_each_entry(&ctx->boot_options, opt, list) + list_for_each_entry(&ctx->boot_options, opt, list) { i++; + if (opt->option->is_default) + defaults++; + } + + if (defaults > 1) { + fprintf(stderr, "%s:%d: parser returned multiple default " + "options\n", file, line); + exit(EXIT_FAILURE); + } if (i == count) return; @@ -250,6 +269,16 @@ void __check_name(struct discover_boot_option *opt, const char *name, } } +void __check_is_default(struct discover_boot_option *opt, + const char *file, int line) +{ + if (opt->option->is_default) + return; + + fprintf(stderr, "%s:%d: default check failed\n", file, line); + exit(EXIT_FAILURE); +} + void __check_resolved_local_resource(struct resource *res, struct discover_device *dev, const char *local_path, const char *file, int line) @@ -275,6 +304,26 @@ void __check_resolved_local_resource(struct resource *res, } } +void __check_resolved_url_resource(struct resource *res, + const char *url, const char *file, int line) +{ + char *res_url; + + if (!res) + errx(EXIT_FAILURE, "%s:%d: No resource", file, line); + + if (!res->resolved) + errx(EXIT_FAILURE, "%s:%d: Resource is not resolved", + file, line); + + res_url = pb_url_to_string(res->url); + if (strcmp(url, res_url)) { + fprintf(stderr, "%s:%d: Resource mismatch\n", file, line); + fprintf(stderr, " got '%s'\n", res_url); + fprintf(stderr, " expected '%s'\n", url); + exit(EXIT_FAILURE); + } +} void __check_unresolved_resource(struct resource *res, const char *file, int line) { @@ -284,3 +333,10 @@ void __check_unresolved_resource(struct resource *res, if (res->resolved) errx(EXIT_FAILURE, "%s:%d: Resource is resolved", file, line); } + +void __check_not_present_resource(struct resource *res, + const char *file, int line) +{ + if (res) + errx(EXIT_FAILURE, "%s:%d: Resource present", file, line); +}