X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=test%2Fparser%2Ftest-grub2-ubuntu-13_04-x86.c;h=8f9785862d3826d27da4f51ced71dd717d2b9dbb;hp=cc4d2838a1ba0325dfdf3c0e2d07af7b9cad39d5;hb=98a3faddc9e01e2bfc9c267f32fce0173678a40a;hpb=e1a6f62162716511956417e6c103de37ce9c71d2

diff --git a/test/parser/test-grub2-ubuntu-13_04-x86.c b/test/parser/test-grub2-ubuntu-13_04-x86.c
index cc4d283..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)");
@@ -32,17 +32,19 @@ void run_test(struct parser_test *test)
 
 	opt = get_boot_option(ctx, 3);
 	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);
+	check_not_present_resource(opt->initrd);
 	check_name(opt, "Memory test (memtest86+, serial console 115200)");
 	check_args(opt, "console=ttyS0,115200n8");
 
 	/* 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);
 
@@ -67,8 +69,10 @@ void run_test(struct parser_test *test)
 	opt = get_boot_option(ctx, 3);
 	check_resolved_local_resource(opt->boot_image, dev,
 		"/boot/memtest86+.bin");
+	check_not_present_resource(opt->initrd);
 
 	opt = get_boot_option(ctx, 4);
 	check_resolved_local_resource(opt->boot_image, dev,
 		"/boot/memtest86+.bin");
+	check_not_present_resource(opt->initrd);
 }