qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 24/56] test-qemu-opts: Test qemu_opts_append()
Date: Fri,  9 Mar 2018 17:19:01 +0100	[thread overview]
Message-ID: <20180309161933.8168-25-kwolf@redhat.com> (raw)
In-Reply-To: <20180309161933.8168-1-kwolf@redhat.com>

Basic test for merging two QemuOptsLists.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 tests/test-qemu-opts.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 5d5a3daa7b..6c3183390b 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -23,6 +23,8 @@ static QemuOptsList opts_list_01 = {
         {
             .name = "str1",
             .type = QEMU_OPT_STRING,
+            .help = "Help texts are preserved in qemu_opts_append",
+            .def_value_str = "default",
         },{
             .name = "str2",
             .type = QEMU_OPT_STRING,
@@ -32,6 +34,7 @@ static QemuOptsList opts_list_01 = {
         },{
             .name = "number1",
             .type = QEMU_OPT_NUMBER,
+            .help = "Having help texts only for some options is okay",
         },{
             .name = "number2",
             .type = QEMU_OPT_NUMBER,
@@ -743,6 +746,129 @@ static void test_opts_parse_size(void)
     qemu_opts_reset(&opts_list_02);
 }
 
+static void append_verify_list_01(QemuOptDesc *desc, bool with_overlapping)
+{
+    int i = 0;
+
+    if (with_overlapping) {
+        g_assert_cmpstr(desc[i].name, ==, "str1");
+        g_assert_cmpint(desc[i].type, ==, QEMU_OPT_STRING);
+        g_assert_cmpstr(desc[i].help, ==,
+                        "Help texts are preserved in qemu_opts_append");
+        g_assert_cmpstr(desc[i].def_value_str, ==, "default");
+        i++;
+
+        g_assert_cmpstr(desc[i].name, ==, "str2");
+        g_assert_cmpint(desc[i].type, ==, QEMU_OPT_STRING);
+        g_assert_cmpstr(desc[i].help, ==, NULL);
+        g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+        i++;
+    }
+
+    g_assert_cmpstr(desc[i].name, ==, "str3");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_STRING);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "number1");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_NUMBER);
+    g_assert_cmpstr(desc[i].help, ==,
+                    "Having help texts only for some options is okay");
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "number2");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_NUMBER);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, NULL);
+}
+
+static void append_verify_list_02(QemuOptDesc *desc)
+{
+    int i = 0;
+
+    g_assert_cmpstr(desc[i].name, ==, "str1");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_STRING);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "str2");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_STRING);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "bool1");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_BOOL);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "bool2");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_BOOL);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "size1");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_SIZE);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "size2");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_SIZE);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+    i++;
+
+    g_assert_cmpstr(desc[i].name, ==, "size3");
+    g_assert_cmpint(desc[i].type, ==, QEMU_OPT_SIZE);
+    g_assert_cmpstr(desc[i].help, ==, NULL);
+    g_assert_cmpstr(desc[i].def_value_str, ==, NULL);
+}
+
+static void test_opts_append_to_null(void)
+{
+    QemuOptsList *merged;
+
+    merged = qemu_opts_append(NULL, &opts_list_01);
+    g_assert(merged != &opts_list_01);
+
+    g_assert_cmpstr(merged->name, ==, NULL);
+    g_assert_cmpstr(merged->implied_opt_name, ==, NULL);
+    g_assert_false(merged->merge_lists);
+
+    append_verify_list_01(merged->desc, true);
+
+    qemu_opts_free(merged);
+}
+
+static void test_opts_append(void)
+{
+    QemuOptsList *first, *merged;
+
+    first = qemu_opts_append(NULL, &opts_list_02);
+    merged = qemu_opts_append(first, &opts_list_01);
+    g_assert(first != &opts_list_02);
+    g_assert(merged != &opts_list_01);
+
+    g_assert_cmpstr(merged->name, ==, NULL);
+    g_assert_cmpstr(merged->implied_opt_name, ==, NULL);
+    g_assert_false(merged->merge_lists);
+
+    append_verify_list_02(&merged->desc[0]);
+    append_verify_list_01(&merged->desc[7], false);
+
+    qemu_opts_free(merged);
+}
+
+
 int main(int argc, char *argv[])
 {
     register_opts();
@@ -761,6 +887,8 @@ 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/append_to_null", test_opts_append_to_null);
+    g_test_add_func("/qemu-opts/append", test_opts_append);
     g_test_run();
     return 0;
 }
-- 
2.13.6

  parent reply	other threads:[~2018-03-09 16:20 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-09 16:18 [Qemu-devel] [PULL 00/56] Block layer patches Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 01/56] block: implement the bdrv_reopen_prepare helper for LUKS driver Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 02/56] qcow2: introduce qcow2_write_caches and qcow2_flush_caches Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 03/56] qcow2: fix flushing after dirty bitmap metadata writes Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 04/56] qcow2: make qcow2_do_open a coroutine_fn Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 05/56] qed: make bdrv_qed_do_open " Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 06/56] block: convert bdrv_invalidate_cache callback to coroutine_fn Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 07/56] block: convert bdrv_check " Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 08/56] qcow2: Generalize validate_table_offset() into qcow2_validate_table() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 09/56] qcow2: Check L1 table offset in qcow2_snapshot_load_tmp() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 10/56] qcow2: Check L1 table parameters in qcow2_expand_zero_clusters() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 11/56] qcow2: Check snapshot L1 tables in qcow2_check_metadata_overlap() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 12/56] qcow2: Check snapshot L1 table in qcow2_snapshot_goto() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 13/56] qcow2: Check snapshot L1 table in qcow2_snapshot_delete() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 14/56] qcow2: Make qemu-img check detect corrupted L1 tables in snapshots Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 15/56] block/qapi: Introduce BlockdevCreateOptions Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 16/56] block/qapi: Add qcow2 create options to schema Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 17/56] qcow2: Rename qcow2_co_create2() to qcow2_co_create() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 18/56] qcow2: Let qcow2_create() handle protocol layer Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 19/56] qcow2: Pass BlockdevCreateOptions to qcow2_co_create() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 20/56] qcow2: Use BlockdevRef in qcow2_co_create() Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 21/56] qcow2: Use QCryptoBlockCreateOptions " Kevin Wolf
2018-03-09 16:18 ` [Qemu-devel] [PULL 22/56] qcow2: Handle full/falloc preallocation " Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 23/56] util: Add qemu_opts_to_qdict_filtered() Kevin Wolf
2018-03-09 16:19 ` Kevin Wolf [this message]
2018-03-09 16:19 ` [Qemu-devel] [PULL 25/56] test-qemu-opts: Test qemu_opts_to_qdict_filtered() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 26/56] qdict: Introduce qdict_rename_keys() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 27/56] qcow2: Use visitor for options in qcow2_create() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 28/56] block: Make bdrv_is_whitelisted() public Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 29/56] block: x-blockdev-create QMP command Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 30/56] file-posix: Support .bdrv_co_create Kevin Wolf
2018-05-08 15:26   ` Peter Maydell
2018-03-09 16:19 ` [Qemu-devel] [PULL 31/56] file-win32: " Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 32/56] gluster: " Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 33/56] rbd: Fix use after free in qemu_rbd_set_keypairs() error path Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 34/56] rbd: Factor out qemu_rbd_connect() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 35/56] rbd: Remove non-schema options from runtime_opts Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 36/56] rbd: Pass BlockdevOptionsRbd to qemu_rbd_connect() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 37/56] rbd: Support .bdrv_co_create Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 38/56] rbd: Assign s->snap/image_name in qemu_rbd_open() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 39/56] rbd: Use qemu_rbd_connect() in qemu_rbd_do_create() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 40/56] nfs: Use QAPI options in nfs_client_open() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 41/56] nfs: Support .bdrv_co_create Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 42/56] sheepdog: QAPIfy "redundancy" create option Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 43/56] sheepdog: Support .bdrv_co_create Kevin Wolf
2018-04-27 14:05   ` Peter Maydell
2018-04-27 14:07   ` Peter Maydell
2018-03-09 16:19 ` [Qemu-devel] [PULL 44/56] ssh: Use QAPI BlockdevOptionsSsh object Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 45/56] ssh: QAPIfy host-key-check option Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 46/56] ssh: Pass BlockdevOptionsSsh to connect_to_ssh() Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 47/56] ssh: Support .bdrv_co_create Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 48/56] file-posix: Fix no-op bdrv_truncate() with falloc preallocation Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 49/56] block: Fail bdrv_truncate() with negative size Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 50/56] qemu-iotests: Test qcow2 over file image creation with QMP Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 51/56] qemu-iotests: Test ssh image creation over QMP Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 52/56] iotests: Test creating overlay when guest running Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 53/56] iotests: Mark all tests executable Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 54/56] iotests: Skip test for ENOMEM error Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 55/56] iotests: Tweak 030 in order to trigger a race condition with parallel jobs Kevin Wolf
2018-03-09 16:19 ` [Qemu-devel] [PULL 56/56] qemu-iotests: fix 203 migration completion race Kevin Wolf
2018-03-12 11:47 ` [Qemu-devel] [PULL 00/56] Block layer patches Peter Maydell

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=20180309161933.8168-25-kwolf@redhat.com \
    --to=kwolf@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).