X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Ftest-grub2-ubuntu-13_04-x86.c;h=2f9aefd47333aa02afa12b289d78a538765017d6;hp=145e4c0cfee1a919b0f911d86d8e387ff3567da3;hb=cc28b17bb59411e6031a8273b784e9d1d3a9490d;hpb=f611bde3f182e9a4befb48a0160d1831708aca67 diff --git a/test/parser/test-grub2-ubuntu-13_04-x86.c b/test/parser/test-grub2-ubuntu-13_04-x86.c index 145e4c0..2f9aefd 100644 --- a/test/parser/test-grub2-ubuntu-13_04-x86.c +++ b/test/parser/test-grub2-ubuntu-13_04-x86.c @@ -7,7 +7,8 @@ void run_test(struct parser_test *test) struct discover_context *ctx; struct discover_device *dev; - test_read_conf_file(test, "grub2-ubuntu-13_04-x86.conf"); + test_read_conf_file(test, "grub2-ubuntu-13_04-x86.conf", "/grub.cfg"); + test_run_parser(test, "grub2"); ctx = test->ctx; @@ -18,13 +19,13 @@ void run_test(struct parser_test *test) check_unresolved_resource(opt->boot_image); check_unresolved_resource(opt->initrd); check_name(opt, "Kubuntu GNU/Linux"); - check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash $vt_handoff"); + check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash "); opt = get_boot_option(ctx, 1); check_unresolved_resource(opt->boot_image); check_unresolved_resource(opt->initrd); check_name(opt, "Kubuntu GNU/Linux, with Linux 3.8.0-19-generic"); - check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash $vt_handoff"); + check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash "); opt = get_boot_option(ctx, 2); check_name(opt, "Kubuntu GNU/Linux, with Linux 3.8.0-19-generic (recovery mode)"); @@ -34,7 +35,7 @@ void run_test(struct parser_test *test) check_unresolved_resource(opt->boot_image); check_not_present_resource(opt->initrd); check_name(opt, "Memory test (memtest86+)"); - check_args(opt, ""); + check_args(opt, NULL); opt = get_boot_option(ctx, 4); check_unresolved_resource(opt->boot_image);