discover/pxe: Format IPAPPEND mac addresses correctly

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

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index 7e43a6843b8386eb0ad3586251292c80fefec41a..21b5b9ca1c98e48ecb70ba5ad38831d1c32024ba 100644 (file)
--- a/test/parser/parser-test.h
+++ b/test/parser/parser-test.h
@@ -9,11 +9,7 @@
 struct parser_test {
        struct device_handler *handler;
        struct discover_context *ctx;
-       struct config *config;
-       struct {
-               void    *buf;
-               size_t  size;
-       } conf;
+       struct list files;
 };
 
 /* interface required for parsers */
@@ -23,17 +19,31 @@ void __register_parser(struct parser *parser);
 struct discover_device *test_create_device(struct parser_test *test,
                const char *name);
 
-#define test_read_conf_data(t, d) \
-       __test_read_conf_data(t, d, sizeof(d))
+#define test_read_conf_data(t, f, d) \
+       __test_read_conf_data(t, t->ctx->device, f, d, sizeof(d))
 
 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);
-void test_set_conf_source(struct parser_test *test, const char *url);
+void test_read_conf_file(struct parser_test *test, const char *filename,
+               const char *conf_file);
 
 int test_run_parser(struct parser_test *test, const char *parser_name);
 
 void test_hotplug_device(struct parser_test *test, struct discover_device *dev);
+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);
+void test_set_event_device(struct event *event, const char *dev);
+
+#define test_add_file_string(test, dev, filename, str) \
+       test_add_file_data(test, dev, filename, str, sizeof(str) - 1)
 
 struct discover_boot_option *get_boot_option(struct discover_context *ctx,
                int idx);
@@ -41,8 +51,13 @@ struct discover_boot_option *get_boot_option(struct discover_context *ctx,
 /* embedded config */
 extern const char __embedded_config[];
 extern const size_t __embedded_config_size;
-#define test_read_conf_embedded(t) \
-       __test_read_conf_data(t, __embedded_config, __embedded_config_size)
+#define test_read_conf_embedded(t, f) \
+       __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.
@@ -118,4 +133,15 @@ void __check_not_present_resource(struct resource *res,
 #define check_not_present_resource(res) \
        __check_not_present_resource(res, __FILE__, __LINE__)
 
+/**
+ * Check the contents of a file - file @filename must be present on @dev,
+ * and match the @len bytes of @buf.
+ */
+void __check_file_contents(struct parser_test *test,
+               struct discover_device *dev, const char *filename,
+               const char *buf, int len,
+               const char *srcfile, int srcline);
+#define check_file_contents(test, dev, filename, buf, len) \
+       __check_file_contents(test, dev, filename, buf, len, __FILE__, __LINE__)
+
 #endif /* PARSER_TEST_H */