diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-09-24 14:01:43 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-09-24 14:01:43 +0800 |
| commit | 98a3faddc9e01e2bfc9c267f32fce0173678a40a (patch) | |
| tree | b9c636521b9da6f7938a3b356b4adfa02fae292c /test | |
| parent | 1a0b831d24ff93b2621ae1d57eaf0471bf7c0398 (diff) | |
| download | talos-petitboot-98a3faddc9e01e2bfc9c267f32fce0173678a40a.tar.gz talos-petitboot-98a3faddc9e01e2bfc9c267f32fce0173678a40a.zip | |
test/parser: Allow checks for NULL boot_args
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/parser/test-grub2-ubuntu-13_04-x86.c | 2 | ||||
| -rw-r--r-- | test/parser/utils.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/parser/test-grub2-ubuntu-13_04-x86.c b/test/parser/test-grub2-ubuntu-13_04-x86.c index 60f1b10..8f97858 100644 --- a/test/parser/test-grub2-ubuntu-13_04-x86.c +++ b/test/parser/test-grub2-ubuntu-13_04-x86.c @@ -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); diff --git a/test/parser/utils.c b/test/parser/utils.c index 7ebb411..f693982 100644 --- a/test/parser/utils.c +++ b/test/parser/utils.c @@ -239,6 +239,9 @@ void __check_args(struct discover_boot_option *opt, const char *args, { int rc; + if (!opt->option->boot_args && !args) + return; + if (!opt->option->boot_args) { fprintf(stderr, "%s:%d: arg check failed\n", file, line); fprintf(stderr, " no arguments parsed\n"); |
