X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=0050d131c6409a9afc80ce53ec16434c95f09cbc;hp=67401abc9e0d8fa5d95cfb2ed9f1b27ba2fce35e;hb=9c33c54f7b431074a7d0daddce34140044aaadf6;hpb=d14bf38b9881c385478a460e3058d7cadee107fb

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 67401ab..0050d13 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -16,6 +16,7 @@
 #include "parser.h"
 #include "resource.h"
 #include "event.h"
+#include "platform.h"
 
 #include "parser-test.h"
 
@@ -26,6 +27,10 @@ struct p_item {
 
 struct test_file {
 	struct discover_device	*dev;
+	enum {
+		TEST_FILE,
+		TEST_DIR,
+	}			type;
 	const char		*name;
 	void			*data;
 	int			size;
@@ -91,14 +96,26 @@ static struct discover_context *test_create_context(struct parser_test *test)
 	return ctx;
 }
 
-extern struct config *test_config_init(struct parser_test *test);
+/* define our own test platform */
+static bool test_platform_probe(struct platform *p __attribute__((unused)),
+		void *ctx __attribute__((unused)))
+{
+	return true;
+}
+
+struct platform test_platform = {
+	.name = "test",
+	.probe = test_platform_probe,
+};
+
+register_platform(test_platform);
 
 struct parser_test *test_init(void)
 {
 	struct parser_test *test;
 
 	test = talloc_zero(NULL, struct parser_test);
-	test->config = test_config_init(test);
+	platform_init(NULL);
 	test->handler = device_handler_init(NULL, NULL, 0);
 	test->ctx = test_create_context(test);
 	list_init(&test->files);
@@ -110,6 +127,7 @@ void test_fini(struct parser_test *test)
 {
 	device_handler_destroy(test->handler);
 	talloc_free(test);
+	platform_fini();
 }
 
 void __test_read_conf_data(struct parser_test *test,
@@ -158,6 +176,7 @@ void test_add_file_data(struct parser_test *test, struct discover_device *dev,
 	struct test_file *file;
 
 	file = talloc_zero(test, struct test_file);
+	file->type = TEST_FILE;
 	file->dev = dev;
 	file->name = filename;
 	file->data = talloc_memdup(test, data, size);
@@ -165,6 +184,18 @@ void test_add_file_data(struct parser_test *test, struct discover_device *dev,
 	list_add(&test->files, &file->list);
 }
 
+void test_add_dir(struct parser_test *test, struct discover_device *dev,
+		const char *dirname)
+{
+	struct test_file *file;
+
+	file = talloc_zero(test, struct test_file);
+	file->type = TEST_DIR;
+	file->dev = dev;
+	file->name = dirname;
+	list_add(&test->files, &file->list);
+}
+
 void test_set_event_source(struct parser_test *test)
 {
         test->ctx->event = talloc_zero(test->ctx, struct event);
@@ -176,6 +207,11 @@ void test_set_event_param(struct event *event, const char *name,
         event_set_param(event, name, value);
 }
 
+void test_set_event_device(struct event *event, const char *dev)
+{
+	event->device = talloc_strdup(event, dev);
+}
+
 int parser_request_file(struct discover_context *ctx,
 		struct discover_device *dev, const char *filename,
 		char **buf, int *len)
@@ -189,6 +225,8 @@ int parser_request_file(struct discover_context *ctx,
 			continue;
 		if (strcmp(file->name, filename))
 			continue;
+		if (file->type != TEST_FILE)
+			continue;
 
 		/* the read_file() interface always adds a trailing null
 		 * for string-safety; do the same here */
@@ -203,6 +241,25 @@ int parser_request_file(struct discover_context *ctx,
 	return -1;
 }
 
+int parser_check_dir(struct discover_context *ctx,
+		struct discover_device *dev, const char *dirname)
+{
+	struct parser_test *test = ctx->test_data;
+	struct test_file *file;
+
+	printf("%s: %s\n", __func__, dirname);
+
+	list_for_each_entry(&test->files, file, list) {
+		if (file->dev != dev)
+			continue;
+		if (strcmp(file->name, dirname))
+			continue;
+		return file->type == TEST_DIR ? 0 : -1;
+	}
+
+	return -1;
+}
+
 int parser_replace_file(struct discover_context *ctx,
 		struct discover_device *dev, const char *filename,
 		char *buf, int len)