From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com
Subject: [PATCH v2 for-5.1 1/9] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt()
Date: Wed, 15 Apr 2020 09:49:19 +0200 [thread overview]
Message-ID: <20200415074927.19897-2-armbru@redhat.com> (raw)
In-Reply-To: <20200415074927.19897-1-armbru@redhat.com>
The two turn out to be inconsistent for "a,b,,help". Test case
marked /* BUG */.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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
next prev parent reply other threads:[~2020-04-15 7:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 7:49 [PATCH v2 for-5.1 0/9] qemu-option: Fix corner cases and clean up Markus Armbruster
2020-04-15 7:49 ` Markus Armbruster [this message]
2020-04-15 12:40 ` [PATCH v2 for-5.1 1/9] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt() Eric Blake
2020-04-15 7:49 ` [PATCH v2 for-5.1 2/9] qemu-options: Factor out get_opt_name_value() helper Markus Armbruster
2020-04-15 7:49 ` [PATCH v2 for-5.1 3/9] qemu-option: Fix sloppy recognition of "id=..." after ", , " Markus Armbruster
2020-04-15 7:49 ` [PATCH v2 for-5.1 4/9] qemu-option: Fix has_help_option()'s sloppy parsing Markus Armbruster
2020-04-15 12:41 ` Eric Blake
2020-04-15 7:49 ` [PATCH v2 for-5.1 5/9] test-qemu-opts: Simplify test_has_help_option() after bug fix Markus Armbruster
2020-04-15 7:49 ` [PATCH v2 for-5.1 6/9] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily() Markus Armbruster
2020-04-15 7:49 ` [PATCH v2 for-5.1 7/9] qemu-img: Factor out accumulate_options() helper Markus Armbruster
2020-04-15 7:49 ` [PATCH v2 for-5.1 8/9] qemu-img: Move is_valid_option_list() to qemu-img.c and rewrite Markus Armbruster
2020-04-15 7:49 ` [PATCH v2 for-5.1 9/9] qemu-img: Reject broken -o "" Markus Armbruster
2020-04-15 12:56 ` Eric Blake
2020-04-15 9:01 ` [PATCH v2 for-5.1 0/9] qemu-option: Fix corner cases and clean up no-reply
2020-04-29 7:12 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415074927.19897-2-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).