[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/20] tests/unit/test-smp-parse: Pass machine type as argument to
From: |
Philippe Mathieu-Daudé |
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 |
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
- [PULL 00/20] Machine-next patches for 2021-12-31, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 01/20] hw/qdev: Cosmetic around documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 02/20] hw/qdev: Correct qdev_init_gpio_out_named() documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 03/20] hw/qdev: Correct qdev_connect_gpio_out_named() documentation, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 04/20] hw/qdev: Rename qdev_connect_gpio_out*() 'input_pin' parameter, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 05/20] tests/unit/test-smp-parse: Pass machine type as argument to tests,
Philippe Mathieu-Daudé <=
- [PULL 06/20] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 07/20] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 08/20] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 09/20] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 10/20] tests/unit/test-smp-parse: Simplify pointer to compound literal use, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 11/20] tests/unit/test-smp-parse: Constify some pointer/struct, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 12/20] hw/core: Rename smp_parse() -> machine_parse_smp_config(), Philippe Mathieu-Daudé, 2021/12/31
- [PULL 14/20] hw/core/machine: Introduce CPU cluster topology support, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 13/20] qemu-options: Improve readability of SMP related Docs, Philippe Mathieu-Daudé, 2021/12/31
- [PULL 15/20] tests/unit/test-smp-parse: Add testcases for CPU clusters, Philippe Mathieu-Daudé, 2021/12/31