From 9e5b77f258b8e993f480763d8e5269bd8c87b508 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 27 Nov 2013 19:51:49 +0800 Subject: discover/grub2: Populate $prefix from config file location Rather than always using the default prefix, we should determine it from the location of the grub2 config file. Signed-off-by: Jeremy Kerr --- test/parser/Makefile.am | 1 + test/parser/test-grub2-nondefault-prefix.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 test/parser/test-grub2-nondefault-prefix.c (limited to 'test') diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index e355af3..f2ee67e 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -36,6 +36,7 @@ TESTS = \ test-grub2-load-env \ test-grub2-save-env \ test-grub2-saved-default \ + test-grub2-nondefault-prefix \ test-grub2-f18-ppc64 \ test-grub2-ubuntu-13_04-x86 \ test-grub2-lexer-error \ diff --git a/test/parser/test-grub2-nondefault-prefix.c b/test/parser/test-grub2-nondefault-prefix.c new file mode 100644 index 0000000..420cf76 --- /dev/null +++ b/test/parser/test-grub2-nondefault-prefix.c @@ -0,0 +1,29 @@ + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +menuentry 'test option' { + linux ${prefix}/vmlinux +} +#endif + + + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + test_read_conf_embedded(test, "/grub/grub.cfg"); + + test_run_parser(test, "grub2"); + + ctx = test->ctx; + + check_boot_option_count(ctx, 1); + opt = get_boot_option(ctx, 0); + + check_name(opt, "test option"); + check_resolved_local_resource(opt->boot_image, ctx->device, + "/grub/vmlinux"); +} -- cgit v1.1