X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=8900bd72bebdcf37ea04c316520b45f4b0db1a15;hp=5cebc99062ad23a06d6217804cf57ae88a298f74;hb=ca11198f4034266b0f48b37e5871c44d1399aba6;hpb=07a5f9f1c50a9185851cd486d732976573d15c4f

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 5cebc99..8900bd7 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -73,7 +73,7 @@ struct discover_device *test_create_device(struct parser_test *test,
 {
 	struct discover_device *dev;
 
-	dev = discover_device_create(test->handler, name);
+	dev = discover_device_create(test->handler, NULL, name);
 
 	dev->device->id = talloc_strdup(dev, name);
 	dev->device_path = talloc_asprintf(dev, "/dev/%s", name);
@@ -93,6 +93,7 @@ static struct discover_context *test_create_context(struct parser_test *test)
 	list_init(&ctx->boot_options);
 	ctx->device = test_create_device_simple(test);
 	ctx->test_data = test;
+	ctx->handler = test->handler;
 	device_handler_add_device(test->handler, ctx->device);
 
 	return ctx;
@@ -309,7 +310,8 @@ int parser_replace_file(struct discover_context *ctx,
 }
 
 struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
-		load_url_complete async_cb, void *async_data)
+		load_url_complete async_cb, void *async_data,
+		waiter_cb stdout_cb, void *stdout_data)
 {
 	struct conf_context *conf = async_data;
 	struct parser_test *test = conf->dc->test_data;
@@ -319,6 +321,10 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
 	struct test_file *file;
 	int fd;
 
+	/* Ignore the stdout callback for tests */
+	(void)stdout_cb;
+	(void)stdout_data;
+
 	fd = mkstemp(tmp);
 
 	if (fd < 0)
@@ -352,6 +358,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
 		return NULL;
 
 	result->local = talloc_strdup(result, tmp);
+	result->url = url;
 	if (rc < 0)
 		result->status = LOAD_ERROR;
 	else