From 44e10d816427c001d60eb5e7b3e75b740e5a2823 Mon Sep 17 00:00:00 2001 From: Ben Stoltz Date: Wed, 15 Jan 2014 15:10:25 -0800 Subject: discover/grub: Use --id values for default option detection Fix Petitboot's grub.cfg parser to handle --id=label argument to menuentry, and use it (in preference to the option name) when looking for a default option. Signed-off-by: Jeremy Kerr --- test/parser/Makefile.am | 1 + test/parser/test-grub2-multiple-id.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 test/parser/test-grub2-multiple-id.c (limited to 'test') diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index 4c3cc69..47fd458 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -32,6 +32,7 @@ TESTS = \ test-grub2-default-index \ test-grub2-default-multiword \ test-grub2-multiple-resolve \ + test-grub2-multiple-id \ test-grub2-single-line-if \ test-grub2-load-env \ test-grub2-save-env \ diff --git a/test/parser/test-grub2-multiple-id.c b/test/parser/test-grub2-multiple-id.c new file mode 100644 index 0000000..8cfb17e --- /dev/null +++ b/test/parser/test-grub2-multiple-id.c @@ -0,0 +1,28 @@ + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +set default="linux2" + +menuentry 'Linux 1' --id=linux1 { + linux /vmlinux1 +} + +menuentry 'Linux 2' --id=linux2 { + linux /vmlinux2 +} +#endif + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + test_read_conf_embedded(test, "/grub2/grub.cfg"); + test_run_parser(test, "grub2"); + + ctx = test->ctx; + check_boot_option_count(ctx, 2); + opt = get_boot_option(ctx, 1); + check_is_default(opt); +} -- cgit v1.2.1