[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/32] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help
From: |
Markus Armbruster |
Subject: |
[PULL 02/32] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt() |
Date: |
Wed, 29 Apr 2020 09:20:18 +0200 |
The two turn out to be inconsistent for "a,b,,help". Test case
marked /* BUG */.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/test-qemu-opts.c | 44 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index ef96e84aed..88a3e7bdf4 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -728,6 +728,49 @@ static void test_opts_parse_size(void)
qemu_opts_reset(&opts_list_02);
}
+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;
+ /* expected value of qemu_opt_has_help_opt() with implied=true */
+ bool expect_opt_has_help_opt_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", false /* BUG */, true, true },
+ { "a,b,,?", false /* BUG */, 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);
+ 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);
+ 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);
+ qemu_opts_del(opts);
+ }
+}
+
static void append_verify_list_01(QemuOptDesc *desc, bool with_overlapping)
{
int i = 0;
@@ -990,6 +1033,7 @@ int main(int argc, char *argv[])
g_test_add_func("/qemu-opts/opts_parse/bool", test_opts_parse_bool);
g_test_add_func("/qemu-opts/opts_parse/number", test_opts_parse_number);
g_test_add_func("/qemu-opts/opts_parse/size", test_opts_parse_size);
+ g_test_add_func("/qemu-opts/has_help_option", test_has_help_option);
g_test_add_func("/qemu-opts/append_to_null", test_opts_append_to_null);
g_test_add_func("/qemu-opts/append", test_opts_append);
g_test_add_func("/qemu-opts/to_qdict/basic", test_opts_to_qdict_basic);
--
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 <=
- [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, 2020/04/29
- [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