X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=6f78c2f93e36e8da2b117bd1ee94e64885e49fc2;hp=fb558cf2c3ec457be3d0ef63a8f399bb06b3f343;hb=4dc604b496f388e6896d46bb02d109103c316e4f;hpb=31998343c5eb5533ef85b97f5bb2ffe200eb2ad0

diff --git a/test/parser/utils.c b/test/parser/utils.c
index fb558cf..6f78c2f 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -17,14 +17,27 @@
 
 #include "parser-test.h"
 
-static int n_parsers;
-static struct parser **parsers;
+struct p_item {
+	struct list_item list;
+	struct parser *parser;
+};
+
+STATIC_LIST(parsers);
 
 void __register_parser(struct parser *parser)
 {
-	parsers = talloc_realloc(NULL, parsers, struct parser *, n_parsers + 1);
-	parsers[n_parsers] = parser;
-	n_parsers++;
+	struct p_item* i = talloc(NULL, struct p_item);
+
+	i->parser = parser;
+	list_add(&parsers, &i->list);
+}
+
+static void __attribute__((destructor)) __cleanup_parsers(void)
+{
+	struct p_item *item, *tmp;
+
+	list_for_each_entry_safe(&parsers, item, tmp, list)
+		talloc_free(item);
 }
 
 static struct discover_device *test_create_device_simple(
@@ -122,23 +135,51 @@ void test_read_conf_file(struct parser_test *test, const char *filename)
 
 int test_run_parser(struct parser_test *test, const char *parser_name)
 {
-	struct parser *parser;
-	int i, rc = 0;
+	struct p_item* i;
 
-	for (i = 0; i < n_parsers; i++) {
-		parser = parsers[i];
-		if (strcmp(parser->name, parser_name))
+	list_for_each_entry(&parsers, i, list) {
+		if (strcmp(i->parser->name, parser_name))
 			continue;
-		test->ctx->parser = parser;
-		rc = parser->parse(test->ctx, test->conf.buf, test->conf.size);
-		break;
+		test->ctx->parser = i->parser;
+		return i->parser->parse(test->ctx, test->conf.buf, test->conf.size);
 	}
 
-	if (i == n_parsers)
-		errx(EXIT_FAILURE, "%s: parser '%s' not found",
-				__func__, parser_name);
+	errx(EXIT_FAILURE, "%s: parser '%s' not found", __func__, parser_name);
+}
+
+bool resource_resolve(struct device_handler *handler, struct parser *parser,
+		struct resource *resource)
+{
+	if (!resource)
+		return true;
+	if (resource->resolved)
+		return true;
 
-	return rc;
+	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,
@@ -186,7 +227,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 +235,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 +249,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 +274,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);
 	}
 }
 
@@ -248,3 +290,10 @@ void __check_unresolved_resource(struct resource *res,
 	if (res->resolved)
 		errx(EXIT_FAILURE, "%s:%d: Resource is resolved", file, line);
 }
+
+void __check_not_present_resource(struct resource *res,
+		const char *file, int line)
+{
+	if (res)
+		errx(EXIT_FAILURE, "%s:%d: Resource present", file, line);
+}