discover/grub2: Add support for -s and -f commands

Implement -s and -f checks for grub, and test with the standard GRUB2
saved_default config.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

2 files changed, 48 insertions, 0 deletions

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index dbf626a..e355af3 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -35,6 +35,7 @@ TESTS = \
 	test-grub2-single-line-if \
 	test-grub2-load-env \
 	test-grub2-save-env \
+	test-grub2-saved-default \
 	test-grub2-f18-ppc64 \
 	test-grub2-ubuntu-13_04-x86 \
 	test-grub2-lexer-error \
diff --git a/test/parser/test-grub2-saved-default.c b/test/parser/test-grub2-saved-default.c
new file mode 100644
index 0000000..c1f6478
--- /dev/null
+++ b/test/parser/test-grub2-saved-default.c
@@ -0,0 +1,47 @@
+
+#include "parser-test.h"
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+if [ -s $prefix/grubenv ]; then
+  load_env
+fi
+if [ "${next_entry}" ] ; then
+   set default="${next_entry}"
+   set next_entry=
+   save_env next_entry
+   set boot_once=true
+else
+   set default="${saved_entry}"
+fi
+menuentry 'test saved option' {
+	linux   vmlinux
+}
+#endif
+
+
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_add_file_string(test, test->ctx->device,
+				"/boot/grub/grubenv",
+				"# GRUB Environment Block\n"
+				"saved_entry=test saved option\n"
+				"#############################");
+
+	test_read_conf_embedded(test, "/boot/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 saved option");
+	check_resolved_local_resource(opt->boot_image, ctx->device,
+			"/vmlinux");
+	check_is_default(opt);
+}