[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/32] test-qemu-opts: Simplify test_has_help_option() after bug f
From: |
Markus Armbruster |
Subject: |
[PULL 06/32] test-qemu-opts: Simplify test_has_help_option() after bug fix |
Date: |
Wed, 29 Apr 2020 09:20:22 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
---
tests/test-qemu-opts.c | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 77c944c4aa..2a0f42a09b 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -732,41 +732,39 @@ static void test_has_help_option(void)
{
static const struct {
const char *params;
- /* expected value of has_help_option() */
- bool expect_has_help_option;
/* expected value of qemu_opt_has_help_opt() with implied=false */
- bool expect_opt_has_help_opt;
+ bool expect;
/* expected value of qemu_opt_has_help_opt() with implied=true */
- bool expect_opt_has_help_opt_implied;
+ bool expect_implied;
} test[] = {
- { "help", true, true, false },
- { "?", true, true, false },
- { "helpme", false, false, false },
- { "?me", false, false, false },
- { "a,help", true, true, true },
- { "a,?", true, true, true },
- { "a=0,help,b", true, true, true },
- { "a=0,?,b", true, true, true },
- { "help,b=1", true, true, false },
- { "?,b=1", true, true, false },
- { "a,b,,help", true, true, true },
- { "a,b,,?", true, true, true },
+ { "help", true, false },
+ { "?", true, false },
+ { "helpme", false, false },
+ { "?me", false, false },
+ { "a,help", true, true },
+ { "a,?", true, true },
+ { "a=0,help,b", true, true },
+ { "a=0,?,b", true, true },
+ { "help,b=1", true, false },
+ { "?,b=1", true, false },
+ { "a,b,,help", true, true },
+ { "a,b,,?", true, true },
};
int i;
QemuOpts *opts;
for (i = 0; i < ARRAY_SIZE(test); i++) {
g_assert_cmpint(has_help_option(test[i].params),
- ==, test[i].expect_has_help_option);
+ ==, test[i].expect);
opts = qemu_opts_parse(&opts_list_03, test[i].params, false,
&error_abort);
g_assert_cmpint(qemu_opt_has_help_opt(opts),
- ==, test[i].expect_opt_has_help_opt);
+ ==, test[i].expect);
qemu_opts_del(opts);
opts = qemu_opts_parse(&opts_list_03, test[i].params, true,
&error_abort);
g_assert_cmpint(qemu_opt_has_help_opt(opts),
- ==, test[i].expect_opt_has_help_opt_implied);
+ ==, test[i].expect_implied);
qemu_opts_del(opts);
}
}
--
2.21.1
- [PULL 00/32] Miscellaneous patches for 2020-04-29, Markus Armbruster, 2020/04/29
- [PULL 10/32] qemu-img: Reject broken -o "", Markus Armbruster, 2020/04/29
- [PULL 02/32] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt(), Markus Armbruster, 2020/04/29
- [PULL 05/32] qemu-option: Fix has_help_option()'s sloppy parsing, Markus Armbruster, 2020/04/29
- [PULL 09/32] qemu-img: Move is_valid_option_list() to qemu-img.c and rewrite, Markus Armbruster, 2020/04/29
- [PULL 03/32] qemu-options: Factor out get_opt_name_value() helper, Markus Armbruster, 2020/04/29
- [PULL 04/32] qemu-option: Fix sloppy recognition of "id=..." after ", , ", Markus Armbruster, 2020/04/29
- [PULL 06/32] test-qemu-opts: Simplify test_has_help_option() after bug fix,
Markus Armbruster <=
- [PULL 20/32] io: Fix qio_channel_socket_close() error handling, Markus Armbruster, 2020/04/29
- [PULL 31/32] libqos: Give get_machine_allocator() internal linkage, Markus Armbruster, 2020/04/29
- [PULL 07/32] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily(), Markus Armbruster, 2020/04/29
- [PULL 19/32] xen/pt: Fix flawed conversion to realize(), Markus Armbruster, 2020/04/29
- [PULL 32/32] qemu-option: pass NULL rather than 0 to the id of qemu_opts_set(), Markus Armbruster, 2020/04/29
- [PULL 08/32] qemu-img: Factor out accumulate_options() helper, Markus Armbruster, 2020/04/29
- [PULL 24/32] qga: Fix qmp_guest_suspend_{disk, ram}() error handling, Markus Armbruster, 2020/04/29
- [PULL 25/32] sam460ex: Suppress useless warning on -m 32 and -m 64, Markus Armbruster, 2020/04/29
- [PULL 27/32] bamboo, sam460ex: Tidy up error message for unsupported RAM size, Markus Armbruster, 2020/04/29
- [PULL 16/32] fdc: Fix fallback=auto error handling, Markus Armbruster, 2020/04/29