X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=0b4c89f5faec63fe239716684c69ba968d1eecc6;hp=a1d0ad24b590d9938dcdd12ed00b3548137d1e97;hb=29452d63438ec97e5332caf1f45e5e12b1e873f8;hpb=a5a787c5d170708be5d15ee9418520917653a104

diff --git a/test/parser/utils.c b/test/parser/utils.c
index a1d0ad2..0b4c89f 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -131,7 +131,72 @@ int test_run_parser(struct parser_test *test, const char *parser_name)
 			continue;
 		test->ctx->parser = parser;
 		rc = parser->parse(test->ctx, test->conf.buf, test->conf.size);
+		break;
 	}
 
+	if (i == n_parsers)
+		errx(EXIT_FAILURE, "%s: parser '%s' not found",
+				__func__, parser_name);
+
 	return rc;
 }
+
+struct discover_boot_option *get_boot_option(struct discover_context *ctx,
+		int idx)
+{
+	struct discover_boot_option *opt;
+	int i = 0;
+
+	list_for_each_entry(&ctx->boot_options, opt, list) {
+		if (i++ == idx)
+			return opt;
+	}
+
+	assert(0);
+
+	return NULL;
+}
+
+void __check_boot_option_count(struct discover_context *ctx, int count,
+		const char *file, int line)
+{
+	struct discover_boot_option *opt;
+	int i = 0;
+
+	list_for_each_entry(&ctx->boot_options, opt, list)
+		i++;
+
+	if (i == count)
+		return;
+
+	fprintf(stderr, "%s:%d: boot option count check failed\n", file, line);
+	fprintf(stderr, "expected %d options, got %d:\n", count, i);
+
+	i = 1;
+	list_for_each_entry(&ctx->boot_options, opt, list)
+		fprintf(stderr, "  %2d: %s [%s]\n", i++, opt->option->name,
+				opt->option->id);
+
+	exit(EXIT_FAILURE);
+}
+
+void __check_args(struct discover_boot_option *opt, const char *args,
+		const char *file, int line)
+{
+	int rc;
+
+	if (!opt->option->boot_args) {
+		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);
+	}
+
+	rc = strcmp(opt->option->boot_args, args);
+	if (rc) {
+		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);
+	}
+}