discover: Remove unnecessary event passing

[petitboot] / test / parser / utils.c

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 3e218e4af07d35292ab2acfde23cb9da2f7dd475..de1dc13e8da60cfd789fb1b28ab62dd4d977e49d 100644 (file)
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -41,25 +41,22 @@ static void __attribute__((destructor)) __cleanup_parsers(void)
 }
 
 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);
@@ -76,16 +73,20 @@ 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->config = test_config_init(test);
        test->handler = device_handler_init(NULL, NULL, 0);
        test->ctx = test_create_context(test);
 
@@ -175,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;
@@ -262,6 +260,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)