summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-09-27 14:16:10 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-10-01 12:51:59 +0800
commite28232f4b8941ccd151abaaae3f18c32400436f3 (patch)
tree2a5b9da5141d64f47fa4eea912ecad39e7e670c6
parentbd6e384a0ba2c1464d9270baf829fea932b88224 (diff)
downloadtalos-petitboot-e28232f4b8941ccd151abaaae3f18c32400436f3.tar.gz
talos-petitboot-e28232f4b8941ccd151abaaae3f18c32400436f3.zip
discover: Add test_data member to struct discover_context
We have parsers passing discover_contexts around, which we want to hook into the test framework. Add a void * member, which the test code can use to reference the test. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--discover/device-handler.c1
-rw-r--r--discover/device-handler.h1
-rw-r--r--test/parser/utils.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index 8b4046e..fc280af 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -520,6 +520,7 @@ struct discover_context *device_handler_discover_context_create(
ctx = talloc(handler, struct discover_context);
ctx->device = device;
ctx->conf_url = NULL;
+ ctx->test_data = NULL;
list_init(&ctx->boot_options);
return ctx;
diff --git a/discover/device-handler.h b/discover/device-handler.h
index 9d477db..5dbc349 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -64,6 +64,7 @@ struct discover_context {
struct list boot_options;
struct pb_url *conf_url;
enum conf_method method;
+ void *test_data;
};
struct device_handler *device_handler_init(struct discover_server *server,
diff --git a/test/parser/utils.c b/test/parser/utils.c
index 7af4df7..40737c4 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -75,6 +75,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;
device_handler_add_device(test->handler, ctx->device);
return ctx;
OpenPOWER on IntegriCloud