X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Ftest-grub2-ubuntu-13_04-x86.c;h=8f9785862d3826d27da4f51ced71dd717d2b9dbb;hp=45da55ff8b1686fec6b02b17d1e307cc268a5e10;hb=98a3faddc9e01e2bfc9c267f32fce0173678a40a;hpb=7d20772cc7b4d258ee878b4cb30b313f14502dc7;ds=sidebyside diff --git a/test/parser/test-grub2-ubuntu-13_04-x86.c b/test/parser/test-grub2-ubuntu-13_04-x86.c index 45da55f..8f97858 100644 --- a/test/parser/test-grub2-ubuntu-13_04-x86.c +++ b/test/parser/test-grub2-ubuntu-13_04-x86.c @@ -18,13 +18,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 +34,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); @@ -44,7 +44,7 @@ void run_test(struct parser_test *test) /* hotplug a device with a maching UUID, and check that our * resources become resolved */ - dev = test_create_device(ctx, "external"); + dev = test_create_device(test, "external"); dev->uuid = "29beca39-9181-4780-bbb2-ab5d4be59aaf"; test_hotplug_device(test, dev);