summaryrefslogtreecommitdiffstats
path: root/test/parser/test-grub2-save-env.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-01-17 16:36:41 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-01-17 16:58:14 +0800
commitd14bf38b9881c385478a460e3058d7cadee107fb (patch)
tree57eb1befbbbdc732b4c0715652081d59b5a55b21 /test/parser/test-grub2-save-env.c
parentb1d15f894473d4b1e90ad273487a432bcd637195 (diff)
downloadtalos-petitboot-d14bf38b9881c385478a460e3058d7cadee107fb.tar.gz
talos-petitboot-d14bf38b9881c385478a460e3058d7cadee107fb.zip
test/parser: Check for full URLs in parser tests
At present, we only match the 'file' portion of a URL in the parser tests, so we "serve" a file if just the filename (but not the scheme, hostname or path) matches the file we set with test_read_conf_embedded. This change introduces test_read_conf_embedded_url, which we can use to specify a full URL. In this case, the fake parser_request_file matches the entire URL before returning the file data. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test/parser/test-grub2-save-env.c')
-rw-r--r--test/parser/test-grub2-save-env.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/parser/test-grub2-save-env.c b/test/parser/test-grub2-save-env.c
index ce9a76a..68e91bd 100644
--- a/test/parser/test-grub2-save-env.c
+++ b/test/parser/test-grub2-save-env.c
@@ -86,7 +86,8 @@ static void run_env_test(struct parser_test *test, struct env_test *envtest)
test_add_file_data(test, test->ctx->device, "/boot/grub/grubenv",
env_before, strlen(env_before));
- __test_read_conf_data(test, "/boot/grub/grub.cfg", envtest->script,
+ __test_read_conf_data(test, test->ctx->device,
+ "/boot/grub/grub.cfg", envtest->script,
strlen(envtest->script));
test_run_parser(test, "grub2");
OpenPOWER on IntegriCloud