discover/yaboot: Allow all image options to be overridden by global options

[petitboot] / test / parser / utils.c

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 6f78c2f93e36e8da2b117bd1ee94e64885e49fc2..3e218e4af07d35292ab2acfde23cb9da2f7dd475 100644 (file)
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -86,7 +86,7 @@ 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->handler = device_handler_init(NULL, NULL, 0);
        test->ctx = test_create_context(test);
 
        return test;
@@ -133,6 +133,12 @@ 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 p_item* i;
@@ -281,6 +287,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)
 {