From: Geoff Levand <geoff@infradead.org>
Date: Fri, 17 May 2013 09:07:43 +0000 (+0800)
Subject: test/parser: Better message output
X-Git-Tag: v1.0.0~609
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=ac319778b407636ae5b0ecf9d75e85752014ef96;hp=32f08e95ad23521e0d68fef46dcbfc7b99dda752

test/parser: Better message output

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 43479b1..9df3a7f 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -221,7 +221,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 +229,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 +243,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 +268,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);
 	}
 }