X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=70a40bbd5b60b2ce40daf3fec41c09b0b5d03a32;hp=43479b1a88aea8cbd3c25a91e578d47ca18eb524;hb=203254ec7ca2352e898acc9ac5c971bcbf630720;hpb=22b9ca8f4b9d28b4405576b39a87d3d0c945dd07

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 43479b1..70a40bb 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(
@@ -73,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;
@@ -122,23 +135,16 @@ 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);
-
-	return rc;
+	errx(EXIT_FAILURE, "%s: parser '%s' not found", __func__, parser_name);
 }
 
 bool resource_resolve(struct device_handler *handler, struct parser *parser,
@@ -221,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);
@@ -229,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);
@@ -243,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);
@@ -268,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);
 	}
 }
 
@@ -283,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);
+}