From 38d7d1a97d46aacf67675038c927e579bb589310 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 7 Aug 2013 10:31:05 +0800 Subject: discover/yaboot: Allow all image options to be overridden by global options All of the image options should be overridable by global options. Instead of building the boot_args during yaboot_process_pair, we add discovered data into the state struct, then create the boot args from this data during yaboot_finish Signed-off-by: Jeremy Kerr --- test/parser/Makefile.am | 1 + test/parser/test-yaboot-root-override.c | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 test/parser/test-yaboot-root-override.c (limited to 'test') diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index bb45a40..4319705 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -35,6 +35,7 @@ TESTS = \ test-yaboot-single \ test-yaboot-external \ test-yaboot-root-global \ + test-yaboot-root-override \ test-yaboot-rh8-ppc64 \ test-pxe-single \ test-pxe-initrd-in-append diff --git a/test/parser/test-yaboot-root-override.c b/test/parser/test-yaboot-root-override.c new file mode 100644 index 0000000..0eea3d4 --- /dev/null +++ b/test/parser/test-yaboot-root-override.c @@ -0,0 +1,35 @@ + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +default=linux +root=/dev/sda1 + +image=/vmlinux + label=linux 1 + +image=/vmlinux + label=linux 2 + root=/dev/sda2 +#endif + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + test_read_conf_embedded(test); + test_run_parser(test, "yaboot"); + + ctx = test->ctx; + + check_boot_option_count(ctx, 2); + + opt = get_boot_option(ctx, 0); + check_name(opt, "linux 1"); + check_args(opt, "root=/dev/sda1"); + + opt = get_boot_option(ctx, 1); + check_name(opt, "linux 2"); + check_args(opt, "root=/dev/sda2"); +} -- cgit v1.2.1