X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=c6d1a170a9b3596daab2c59fbbc49aa7a034530a;hp=80117937e56f2f598e8bf211a2d3235d8072d26d;hb=d30872fe40c87300e62ef2aea484b9cea618c9de;hpb=d27570168fd6d5a2144553002c8082ae626b7e84

diff --git a/test/parser/utils.c b/test/parser/utils.c
index 8011793..c6d1a17 100644
--- a/test/parser/utils.c
+++ b/test/parser/utils.c
@@ -16,6 +16,9 @@
 #include "parser.h"
 #include "resource.h"
 #include "event.h"
+#include "platform.h"
+#include "paths.h"
+#include "parser-conf.h"
 
 #include "parser-test.h"
 
@@ -26,6 +29,10 @@ struct p_item {
 
 struct test_file {
 	struct discover_device	*dev;
+	enum {
+		TEST_FILE,
+		TEST_DIR,
+	}			type;
 	const char		*name;
 	void			*data;
 	int			size;
@@ -66,7 +73,7 @@ struct discover_device *test_create_device(struct parser_test *test,
 {
 	struct discover_device *dev;
 
-	dev = discover_device_create(test->handler, name);
+	dev = discover_device_create(test->handler, NULL, name);
 
 	dev->device->id = talloc_strdup(dev, name);
 	dev->device_path = talloc_asprintf(dev, "/dev/%s", name);
@@ -86,19 +93,32 @@ static struct discover_context *test_create_context(struct parser_test *test)
 	list_init(&ctx->boot_options);
 	ctx->device = test_create_device_simple(test);
 	ctx->test_data = test;
+	ctx->handler = test->handler;
 	device_handler_add_device(test->handler, ctx->device);
 
 	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,12 +130,14 @@ 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, 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)
 {
-	test_add_file_data(test, test->ctx->device, conf_file, buf, len);
+	test_add_file_data(test, dev, conf_file, buf, len);
 }
 
 void test_read_conf_file(struct parser_test *test, const char *filename,
@@ -157,6 +179,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);
@@ -164,6 +187,21 @@ 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;
+	/* Pick a non-zero size for directories so that "[ -s <dir
+	 * path> ]" sees that the file has non-zero size. */
+	file->size = 1;
+	list_add(&test->files, &file->list);
+}
+
 void test_set_event_source(struct parser_test *test)
 {
         test->ctx->event = talloc_zero(test->ctx, struct event);
@@ -175,6 +213,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)
@@ -188,6 +231,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 */
@@ -202,12 +247,45 @@ int parser_request_file(struct discover_context *ctx,
 	return -1;
 }
 
+int parser_stat_path(struct discover_context *ctx,
+		struct discover_device *dev, const char *path,
+		struct stat *statbuf)
+{
+	struct parser_test *test = ctx->test_data;
+	struct test_file *file;
+
+	list_for_each_entry(&test->files, file, list) {
+		if (file->dev != dev)
+			continue;
+		if (strcmp(file->name, path))
+			continue;
+
+		statbuf->st_size = (off_t)file->size;
+		switch (file->type) {
+		case TEST_FILE:
+			statbuf->st_mode = S_IFREG;
+			break;
+		case TEST_DIR:
+			statbuf->st_mode = S_IFDIR;
+			break;
+		default:
+			fprintf(stderr, "%s: bad test file mode %d!", __func__,
+				file->type);
+			exit(EXIT_FAILURE);
+		}
+
+		return 0;
+	}
+
+	return -1;
+}
+
 int parser_replace_file(struct discover_context *ctx,
 		struct discover_device *dev, const char *filename,
 		char *buf, int len)
 {
 	struct parser_test *test = ctx->test_data;
-	struct test_file *f, *file;
+	struct test_file *f, *file = NULL;
 
 	list_for_each_entry(&test->files, f, list) {
 		if (f->dev != dev)
@@ -231,6 +309,129 @@ int parser_replace_file(struct discover_context *ctx,
 	return 0;
 }
 
+int parser_scandir(struct discover_context *ctx, const char *dirname,
+		   struct dirent ***files, int (*filter)(const struct dirent *)
+		   __attribute__((unused)),
+		   int (*comp)(const struct dirent **, const struct dirent **)
+		   __attribute__((unused)))
+{
+	struct parser_test *test = ctx->test_data;
+	struct test_file *f;
+	char *filename;
+	struct dirent **dirents = NULL, **new_dirents;
+	int n = 0, namelen;
+
+	list_for_each_entry(&test->files, f, list) {
+		if (f->dev != ctx->device)
+			continue;
+
+		if (strlen(f->name) <= strlen(dirname))
+			continue;
+
+		filename = strrchr(f->name, '/');
+		if (!filename)
+			continue;
+
+		namelen = strlen(filename);
+
+		if (strncmp(f->name, dirname, strlen(f->name) - namelen))
+			continue;
+
+		if (!dirents) {
+			dirents = malloc(sizeof(struct dirent *));
+		} else {
+			new_dirents = realloc(dirents, sizeof(struct dirent *)
+					      * (n + 1));
+			if (!new_dirents)
+				goto err_cleanup;
+
+			dirents = new_dirents;
+		}
+
+		dirents[n] = malloc(sizeof(struct dirent) + namelen + 1);
+
+		if (!dirents[n])
+			goto err_cleanup;
+
+		strcpy(dirents[n]->d_name, filename + 1);
+		n++;
+	}
+
+	*files = dirents;
+
+	return n;
+
+err_cleanup:
+	do {
+		free(dirents[n]);
+	} while (n-- > 0);
+
+	free(dirents);
+
+	return -1;
+}
+
+struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
+		load_url_complete async_cb, void *async_data,
+		waiter_cb stdout_cb, void *stdout_data)
+{
+	struct conf_context *conf = async_data;
+	struct parser_test *test = conf->dc->test_data;
+	struct load_url_result *result;
+	char tmp[] = "/tmp/pb-XXXXXX";
+	ssize_t rc = -1, sz = 0;
+	struct test_file *file;
+	int fd;
+
+	/* Ignore the stdout callback for tests */
+	(void)stdout_cb;
+	(void)stdout_data;
+
+	fd = mkstemp(tmp);
+
+	if (fd < 0)
+		return NULL;
+
+	/* Some parsers will expect to need to read a file, so write the
+	 * specified file to a temporary file */
+	list_for_each_entry(&test->files, file, list) {
+		if (file->dev)
+			continue;
+
+		if (strcmp(file->name, url->full))
+			continue;
+
+		while (sz < file->size) {
+			rc = write(fd, file->data, file->size);
+			if (rc < 0) {
+				fprintf(stderr,
+					"Failed to write to tmpfile, %m\n");
+				break;
+			}
+			sz += rc;
+		}
+		break;
+	}
+
+	close(fd);
+
+	result = talloc_zero(ctx, struct load_url_result);
+	if (!result)
+		return NULL;
+
+	result->local = talloc_strdup(result, tmp);
+	result->url = url;
+	if (rc < 0)
+		result->status = LOAD_ERROR;
+	else
+		result->status = result->local ? LOAD_OK : LOAD_ERROR;
+	result->cleanup_local = true;
+
+	async_cb(result, conf);
+
+	return result;
+}
+
 int parser_request_url(struct discover_context *ctx, struct pb_url *url,
 		char **buf, int *len)
 {
@@ -239,7 +440,10 @@ int parser_request_url(struct discover_context *ctx, struct pb_url *url,
 	char *tmp;
 
 	list_for_each_entry(&test->files, file, list) {
-		if (strcmp(file->name, url->file))
+		if (file->dev)
+			continue;
+
+		if (strcmp(file->name, url->full))
 			continue;
 
 		/* the read_file() interface always adds a trailing null