From: Jeremy Kerr Date: Tue, 9 Jul 2013 08:14:00 +0000 (+0800) Subject: test/parser: Add check_resolved_url_resource X-Git-Tag: v1.0.0~552 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=9ecdab4194422f1f72486745a9d6db79badd36ae;ds=sidebyside test/parser: Add check_resolved_url_resource Add a check for external URL resources. Signed-off-by: Jeremy Kerr --- diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h index 9d9ec7e..5329618 100644 --- a/test/parser/parser-test.h +++ b/test/parser/parser-test.h @@ -85,6 +85,14 @@ void __check_resolved_local_resource(struct resource *res, struct discover_device *dev, const char *local_path, const char *file, int line); +/** + * Check that a resource (@res) is present, resolved, and has a URL of + * @url. + */ +#define check_resolved_url_resource(res, url) \ + __check_resolved_url_resource(res, url, __FILE__, __LINE__) +void __check_resolved_url_resource(struct resource *res, + const char *url, const char *file, int line); /** * Check that a resource (@res) is present but not resolved */ diff --git a/test/parser/utils.c b/test/parser/utils.c index f1604e0..3e218e4 100644 --- a/test/parser/utils.c +++ b/test/parser/utils.c @@ -287,6 +287,26 @@ void __check_resolved_local_resource(struct resource *res, } } +void __check_resolved_url_resource(struct resource *res, + const char *url, const char *file, int line) +{ + char *res_url; + + if (!res) + errx(EXIT_FAILURE, "%s:%d: No resource", file, line); + + if (!res->resolved) + errx(EXIT_FAILURE, "%s:%d: Resource is not resolved", + file, line); + + res_url = pb_url_to_string(res->url); + if (strcmp(url, res_url)) { + fprintf(stderr, "%s:%d: Resource mismatch\n", file, line); + fprintf(stderr, " got '%s'\n", res_url); + fprintf(stderr, " expected '%s'\n", url); + exit(EXIT_FAILURE); + } +} void __check_unresolved_resource(struct resource *res, const char *file, int line) {