X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Fparser-test.h;h=383680fabb9ede74bfda88e3a3a5c5cd42b5a63e;hp=ab3424c7e676c371f9f5f6cf23831c605965399b;hb=86c9d34380b0074dab1ba89a569a94280d6999c4;hpb=1b646fb733ef99b1dc1862276ae3595bdeaf355b

diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h
index ab3424c..383680f 100644
--- a/test/parser/parser-test.h
+++ b/test/parser/parser-test.h
@@ -10,11 +10,6 @@ struct parser_test {
 	struct device_handler *handler;
 	struct discover_context *ctx;
 	struct list files;
-	struct config *config;
-	struct {
-		void	*buf;
-		size_t	size;
-	} conf;
 };
 
 /* interface required for parsers */
@@ -24,20 +19,33 @@ 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);
 
+/* Note that the testing filesystem will only reflect files and
+ * directories that you explicitly add, so it is possible for a test
+ * to inconsistently believe that a file exists but that its parent
+ * directory does not. */
 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)
@@ -48,8 +56,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.