From 77e0df22dd3fb1cf0dcdd1124a5aafa2ec872a1f Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 27 Nov 2013 20:00:11 +0800 Subject: [PATCH 1/1] test/parser/grub2: Fix inconsistent conf/env paths In an upcoming change, we'll populate $prefix (which is used to locate the environment file) based on the location of the config file, so these paths will need to be consistent. Signed-off-by: Jeremy Kerr --- test/parser/test-grub2-load-env.c | 2 +- test/parser/test-grub2-save-env.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parser/test-grub2-load-env.c b/test/parser/test-grub2-load-env.c index 36fb3c5..6142e52 100644 --- a/test/parser/test-grub2-load-env.c +++ b/test/parser/test-grub2-load-env.c @@ -18,7 +18,7 @@ void run_test(struct parser_test *test) "# GRUB Environment Block\n" "kernel=vmlinux-from-env\n"); - test_read_conf_embedded(test, "/boot/grub2/grub.cfg"); + test_read_conf_embedded(test, "/boot/grub/grub.cfg"); test_run_parser(test, "grub2"); diff --git a/test/parser/test-grub2-save-env.c b/test/parser/test-grub2-save-env.c index 7f15164..ce9a76a 100644 --- a/test/parser/test-grub2-save-env.c +++ b/test/parser/test-grub2-save-env.c @@ -86,7 +86,7 @@ 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/grub2/grub.cfg", envtest->script, + __test_read_conf_data(test, "/boot/grub/grub.cfg", envtest->script, strlen(envtest->script)); test_run_parser(test, "grub2"); -- 2.39.2