X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Fparser-test.h;h=7e43a6843b8386eb0ad3586251292c80fefec41a;hp=ab3744315f1260ddc1a5787a2aadc0436a7e925b;hb=98a3faddc9e01e2bfc9c267f32fce0173678a40a;hpb=7d20772cc7b4d258ee878b4cb30b313f14502dc7

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index ab37443..7e43a68 100644
--- 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) \
@@ -28,6 +29,7 @@ struct discover_device *test_create_device(struct discover_context *ctx,
 void __test_read_conf_data(struct parser_test *test,
 		const char *buf, size_t len);
 void test_read_conf_file(struct parser_test *test, const char *filename);
+void test_set_conf_source(struct parser_test *test, const char *url);
 
 int test_run_parser(struct parser_test *test, const char *parser_name);
 
@@ -73,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.
@@ -84,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
  */