X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Futils.c;h=67401abc9e0d8fa5d95cfb2ed9f1b27ba2fce35e;hp=80117937e56f2f598e8bf211a2d3235d8072d26d;hb=d14bf38b9881c385478a460e3058d7cadee107fb;hpb=d27570168fd6d5a2144553002c8082ae626b7e84 diff --git a/test/parser/utils.c b/test/parser/utils.c index 8011793..67401ab 100644 --- a/test/parser/utils.c +++ b/test/parser/utils.c @@ -112,10 +112,11 @@ void test_fini(struct parser_test *test) talloc_free(test); } -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, @@ -239,7 +240,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