[PATCH 6/7] test/parser: test no whitespace on grub menuentry

Brett Grandbois brett.grandbois at opengear.com
Tue Feb 6 07:40:33 AEDT 2018


Signed-off-by: Brett Grandbois <brett.grandbois at opengear.com>
---
 test/parser/Makefile.am               |  1 +
 test/parser/test-grub2-single-yocto.c | 38 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 test/parser/test-grub2-single-yocto.c

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index eb71a07..31300f0 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -39,6 +39,7 @@ parser_TESTS = \
 	test/parser/test-grub2-lexer-error \
 	test/parser/test-grub2-parser-error \
 	test/parser/test-grub2-test-file-ops \
+	test/parser/test-grub2-single-yocto \
 	test/parser/test-kboot-single \
 	test/parser/test-yaboot-empty \
 	test/parser/test-yaboot-single \
diff --git a/test/parser/test-grub2-single-yocto.c b/test/parser/test-grub2-single-yocto.c
new file mode 100644
index 0000000..4c8ccba
--- /dev/null
+++ b/test/parser/test-grub2-single-yocto.c
@@ -0,0 +1,38 @@
+
+#include "parser-test.h"
+
+/*
+ * yocto default efi-grub wks doesn't put a space between the menuentry
+ * label and the '{'
+ */
+
+#if 0 /* PARSER_EMBEDDED_CONFIG */
+serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+default=boot
+timeout=0
+menuentry 'boot'{
+linux /bzImage console=ttyS0,115200n8 console=tty0
+}
+#endif
+
+void run_test(struct parser_test *test)
+{
+	struct discover_boot_option *opt;
+	struct discover_context *ctx;
+
+	test_read_conf_embedded(test, "/efi/boot/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, "boot");
+	check_resolved_local_resource(opt->boot_image, ctx->device, "/bzImage");
+	check_not_present_resource(opt->initrd);
+	check_is_default(opt);
+
+	check_args(opt, "console=ttyS0,115200n8 console=tty0");
+}
-- 
2.7.4



More information about the Petitboot mailing list