summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-08-07 10:31:05 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-08-07 10:31:05 +0800
commit38d7d1a97d46aacf67675038c927e579bb589310 (patch)
tree5436346ac11296db1fcc67953527f7a4fc904793 /test
parentf9a63d3a640cb30a12598cedc0dd7d8b6fc5b4de (diff)
downloadtalos-petitboot-38d7d1a97d46aacf67675038c927e579bb589310.tar.gz
talos-petitboot-38d7d1a97d46aacf67675038c927e579bb589310.zip
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 <jk@ozlabs.org>
Diffstat (limited to 'test')
-rw-r--r--test/parser/Makefile.am1
-rw-r--r--test/parser/test-yaboot-root-override.c35
2 files changed, 36 insertions, 0 deletions
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");
+}
OpenPOWER on IntegriCloud