X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Fparser-test.h;h=631f1e52ae765139742c1033cee51c11f2937c8d;hp=eb43c25c7c128eb57c24d4516432f4334ee3bcf2;hb=4896183708855fbfd0aa892537fbcc17ed7eb971;hpb=b86a7a0533c4d723ea940ac2071f845f165f832c

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index eb43c25..631f1e5 100644
--- a/test/parser/parser-test.h
+++ b/test/parser/parser-test.h
@@ -11,10 +11,6 @@ struct parser_test {
 	struct discover_context *ctx;
 	struct list files;
 	struct config *config;
-	struct {
-		void	*buf;
-		size_t	size;
-	} conf;
 };
 
 /* interface required for parsers */
@@ -24,23 +20,30 @@ 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, void *data, int size);
+		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);
 
 #define test_add_file_string(test, dev, filename, str) \
-	test_add_file_data(test, dev, filename, str, sizeof(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);
@@ -48,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.
@@ -125,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 */