test/parser: Better message output

[petitboot] / test / parser / utils.c

diff --git a/test/parser/utils.c b/test/parser/utils.c
index fb558cf2c3ec457be3d0ef63a8f399bb06b3f343..9df3a7fb67eda09dd861a53213662d370fc54752 100644 (file)
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -141,6 +141,41 @@ int test_run_parser(struct parser_test *test, const char *parser_name)
        return rc;
 }
 
+bool resource_resolve(struct device_handler *handler, struct parser *parser,
+               struct resource *resource)
+{
+       if (!resource)
+               return true;
+       if (resource->resolved)
+               return true;
+
+       assert(parser);
+       assert(parser->resolve_resource);
+
+       return parser->resolve_resource(handler, resource);
+}
+
+void boot_option_resolve(struct device_handler *handler,
+               struct discover_boot_option *opt)
+{
+       resource_resolve(handler, opt->source, opt->boot_image);
+       resource_resolve(handler, opt->source, opt->initrd);
+       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;
+
+       device_handler_add_device(test->handler, dev);
+
+       list_for_each_entry(&test->ctx->boot_options, opt, list)
+               boot_option_resolve(test->handler, opt);
+}
+
 struct discover_boot_option *get_boot_option(struct discover_context *ctx,
                int idx)
 {
@@ -186,7 +221,7 @@ void __check_args(struct discover_boot_option *opt, const char *args,
        int rc;
 
        if (!opt->option->boot_args) {
-               fprintf(stderr, "%s%d: arg check failed\n", file, line);
+               fprintf(stderr, "%s:%d: arg check failed\n", file, line);
                fprintf(stderr, "  no arguments parsed\n");
                fprintf(stderr, "  expected '%s'\n", args);
                exit(EXIT_FAILURE);
@@ -194,7 +229,7 @@ void __check_args(struct discover_boot_option *opt, const char *args,
 
        rc = strcmp(opt->option->boot_args, args);
        if (rc) {
-               fprintf(stderr, "%s%d: arg check failed\n", file, line);
+               fprintf(stderr, "%s:%d: arg check failed\n", file, line);
                fprintf(stderr, "  got      '%s'\n", opt->option->boot_args);
                fprintf(stderr, "  expected '%s'\n", args);
                exit(EXIT_FAILURE);
@@ -208,7 +243,7 @@ void __check_name(struct discover_boot_option *opt, const char *name,
 
        rc = strcmp(opt->option->name, name);
        if (rc) {
-               fprintf(stderr, "%s%d: name check failed\n", file, line);
+               fprintf(stderr, "%s:%d: name check failed\n", file, line);
                fprintf(stderr, "  got      '%s'\n", opt->option->name);
                fprintf(stderr, "  expected '%s'\n", name);
                exit(EXIT_FAILURE);
@@ -233,9 +268,10 @@ void __check_resolved_local_resource(struct resource *res,
        got_url = pb_url_to_string(res->url);
 
        if (strcmp(got_url, exp_url)) {
-               errx(EXIT_FAILURE,
-                               "%s:%d Resource mismatch: got %s, expected %s",
-                               file, line, got_url, exp_url);
+               fprintf(stderr, "%s:%d: Resource mismatch\n", file, line);
+               fprintf(stderr, "  got      '%s'\n", got_url);
+               fprintf(stderr, "  expected '%s'\n", exp_url);
+               exit(EXIT_FAILURE);
        }
 }