pb-config: Move config storage modules to "platform" modules in discover code

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

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index c23a7b051d3d001110b3e81d52cc26497dfbdb1f..c0339b89a4f2ca809f6ca27e9ffe9986cf99022a 100644 (file)
--- a/test/parser/parser-test.h
+++ b/test/parser/parser-test.h
@@ -10,7 +10,6 @@ struct parser_test {
        struct device_handler *handler;
        struct discover_context *ctx;
        struct list files;
-       struct config *config;
 };
 
 /* interface required for parsers */
@@ -21,9 +20,10 @@ struct discover_device *test_create_device(struct parser_test *test,
                const char *name);
 
 #define test_read_conf_data(t, f, d) \
-       __test_read_conf_data(t, f, d, sizeof(d))
+       __test_read_conf_data(t, t->ctx->device, f, d, sizeof(d))
 
-void __test_read_conf_data(struct parser_test *test, const char *conf_file,
+void __test_read_conf_data(struct parser_test *test,
+               struct discover_device *dev, const char *conf_file,
                const char *buf, size_t len);
 void test_read_conf_file(struct parser_test *test, const char *filename,
                const char *conf_file);
@@ -35,6 +35,8 @@ void test_remove_device(struct parser_test *test, struct discover_device *dev);
 
 void test_add_file_data(struct parser_test *test, struct discover_device *dev,
                const char *filename, const void *data, int size);
+void test_add_dir(struct parser_test *test, struct discover_device *dev,
+               const char *dirname);
 void test_set_event_source(struct parser_test *test);
 void test_set_event_param(struct event *event, const char *name,
                const char *value);
@@ -49,7 +51,12 @@ struct discover_boot_option *get_boot_option(struct discover_context *ctx,
 extern const char __embedded_config[];
 extern const size_t __embedded_config_size;
 #define test_read_conf_embedded(t, f) \
-       __test_read_conf_data(t, f, __embedded_config, __embedded_config_size)
+       __test_read_conf_data(t, t->ctx->device, f, \
+                               __embedded_config, __embedded_config_size)
+
+#define test_read_conf_embedded_url(t, u) \
+       __test_read_conf_data(t, NULL, u, \
+                               __embedded_config, __embedded_config_size)
 
 /**
  * Checks for parser results.