qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Yanan Wang" <wangyanan55@huawei.com>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 05/20] tests/unit/test-smp-parse: Pass machine type as argument to tests
Date: Fri, 31 Dec 2021 13:47:39 +0100	[thread overview]
Message-ID: <20211231124754.1005747-6-philmd@redhat.com> (raw)
In-Reply-To: <20211231124754.1005747-1-philmd@redhat.com>

Use g_test_add_data_func() instead of g_test_add_func() so we can
pass the machine type to the tests (we will soon have different
machine types).

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211216132015.815493-2-philmd@redhat.com>
---
 tests/unit/test-smp-parse.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index b02450e25a3..37c6b4981db 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -487,9 +487,10 @@ static void machine_base_class_init(ObjectClass *oc, void *data)
     mc->name = g_strdup(SMP_MACHINE_NAME);
 }
 
-static void test_generic(void)
+static void test_generic(const void *opaque)
 {
-    Object *obj = object_new(TYPE_MACHINE);
+    const char *machine_type = opaque;
+    Object *obj = object_new(machine_type);
     MachineState *ms = MACHINE(obj);
     MachineClass *mc = MACHINE_GET_CLASS(obj);
     SMPTestData *data = &(SMPTestData){{ }};
@@ -525,9 +526,10 @@ static void test_generic(void)
     object_unref(obj);
 }
 
-static void test_with_dies(void)
+static void test_with_dies(const void *opaque)
 {
-    Object *obj = object_new(TYPE_MACHINE);
+    const char *machine_type = opaque;
+    Object *obj = object_new(machine_type);
     MachineState *ms = MACHINE(obj);
     MachineClass *mc = MACHINE_GET_CLASS(obj);
     SMPTestData *data = &(SMPTestData){{ }};
@@ -599,8 +601,12 @@ int main(int argc, char *argv[])
 
     g_test_init(&argc, &argv, NULL);
 
-    g_test_add_func("/test-smp-parse/generic", test_generic);
-    g_test_add_func("/test-smp-parse/with_dies", test_with_dies);
+    g_test_add_data_func("/test-smp-parse/generic",
+                         TYPE_MACHINE,
+                         test_generic);
+    g_test_add_data_func("/test-smp-parse/with_dies",
+                         TYPE_MACHINE,
+                         test_with_dies);
 
     g_test_run();
 
-- 
2.33.1



  parent reply	other threads:[~2021-12-31 12:55 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-31 12:47 [PULL 00/20] Machine-next patches for 2021-12-31 Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 01/20] hw/qdev: Cosmetic around documentation Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 02/20] hw/qdev: Correct qdev_init_gpio_out_named() documentation Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 03/20] hw/qdev: Correct qdev_connect_gpio_out_named() documentation Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 04/20] hw/qdev: Rename qdev_connect_gpio_out*() 'input_pin' parameter Philippe Mathieu-Daudé
2021-12-31 12:47 ` Philippe Mathieu-Daudé [this message]
2021-12-31 12:47 ` [PULL 06/20] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 07/20] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 08/20] tests/unit/test-smp-parse: Add 'smp-generic-invalid' " Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 09/20] tests/unit/test-smp-parse: Add 'smp-generic-valid' " Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 10/20] tests/unit/test-smp-parse: Simplify pointer to compound literal use Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 11/20] tests/unit/test-smp-parse: Constify some pointer/struct Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 12/20] hw/core: Rename smp_parse() -> machine_parse_smp_config() Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 13/20] qemu-options: Improve readability of SMP related Docs Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 14/20] hw/core/machine: Introduce CPU cluster topology support Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 15/20] tests/unit/test-smp-parse: Add testcases for CPU clusters Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 16/20] tests/unit/test-smp-parse: No need to explicitly zero MachineClass members Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 17/20] tests/unit/test-smp-parse: Keep default MIN/MAX CPUs in machine_base_class_init Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 18/20] MAINTAINERS: Self-recommended as reviewer of "Machine core" Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 19/20] MAINTAINERS: Change philmd's email address Philippe Mathieu-Daudé
2021-12-31 12:47 ` [PULL 20/20] MAINTAINERS: email address change Philippe Mathieu-Daudé
2021-12-31 17:07 ` [PULL 00/20] Machine-next patches for 2021-12-31 Richard Henderson
2021-12-31 17:24   ` Philippe Mathieu-Daudé
2021-12-31 19:06 ` Richard Henderson
2021-12-31 20:57   ` Philippe Mathieu-Daudé

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=20211231124754.1005747-6-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=wangyanan55@huawei.com \
    /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).