test/parser: Allow checks for NULL boot_args

[petitboot] / test / parser / parser-test.h

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index 9d9ec7e77d0bf4acdf0939a6dc9dc9b66c5ad41b..7e43a6843b8386eb0ad3586251292c80fefec41a 100644 (file)
--- a/test/parser/parser-test.h
+++ b/test/parser/parser-test.h
@@ -9,6 +9,7 @@
 struct parser_test {
        struct device_handler *handler;
        struct discover_context *ctx;
+       struct config *config;
        struct {
                void    *buf;
                size_t  size;
@@ -19,7 +20,7 @@ struct parser_test {
 void __register_parser(struct parser *parser);
 
 /* test functions */
-struct discover_device *test_create_device(struct discover_context *ctx,
+struct discover_device *test_create_device(struct parser_test *test,
                const char *name);
 
 #define test_read_conf_data(t, d) \
@@ -74,6 +75,14 @@ void __check_name(struct discover_boot_option *opt, const char *name,
 #define check_name(opt, name) \
        __check_name(opt, name, __FILE__, __LINE__)
 
+/**
+ * Check that a boot option @opt is marked as default
+ */
+void __check_is_default(struct discover_boot_option *opt,
+               const char *file, int line);
+#define check_is_default(opt) \
+       __check_is_default(opt, __FILE__, __LINE__)
+
 /**
  * Check that a resource (@res) is present, resolved, and has a local path
  * (within @dev's mount point) of @path.
@@ -85,6 +94,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
  */