70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
From d8b2aee4fd6ccd8eb621522b647c392c1dd7955c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Mon, 15 Nov 2021 12:32:09 +0100
|
|
Subject: [PATCH 02/24] tests/unit/test-smp-parse: Pass machine type as
|
|
argument to tests
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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 b02450e25a..37c6b4981d 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.27.0
|
|
|