[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-5.1 6/8] test-qemu-opts: Simplify test_has_help_option() afte
From: |
Markus Armbruster |
Subject: |
[PATCH for-5.1 6/8] test-qemu-opts: Simplify test_has_help_option() after bug fix |
Date: |
Thu, 9 Apr 2020 17:30:39 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/test-qemu-opts.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 58a4ea2408..909118d617 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -732,35 +732,33 @@ 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 },
- { "helpme", false, false, false },
- { "a,help", true, true, true },
- { "a=0,help,b", true, true, true },
- { "help,b=1", true, true, false },
- { "a,b,,help", true, true, true },
+ { "help", true, false },
+ { "helpme", false, false },
+ { "a,help", true, true },
+ { "a=0,help,b", true, true },
+ { "help,b=1", true, false },
+ { "a,b,,help", 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
- Re: [PATCH for-5.1 8/8] qemu-option: Move is_valid_option_list() to qemu-img.c and rewrite, (continued)
[PATCH for-5.1 2/8] qemu-options: Factor out get_opt_name_value() helper, Markus Armbruster, 2020/04/09
Re: [PATCH for-5.1 2/8] qemu-options: Factor out get_opt_name_value() helper, Kevin Wolf, 2020/04/14
[PATCH for-5.1 6/8] test-qemu-opts: Simplify test_has_help_option() after bug fix,
Markus Armbruster <=
[PATCH for-5.1 3/8] qemu-option: Fix sloppy recognition of "id=..." after ", , ", Markus Armbruster, 2020/04/09
[PATCH for-5.1 5/8] qemu-option: Fix has_help_option()'s sloppy parsing, Markus Armbruster, 2020/04/09