| Message ID | 20211115145900.2531865-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/unit: Fix test-smp-parse | expand |
On 11/15/21 3:58 PM, Philippe Mathieu-Daudé wrote: > 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). > > Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com> > --- > tests/unit/test-smp-parse.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 2021/11/15 22:58, Philippe Mathieu-Daudé wrote: > 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). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/unit/test-smp-parse.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) Reviewed-by: Yanan Wang <wangyanan55@huawei.com> Thanks, Yanan > 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(); >
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();
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). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/unit/test-smp-parse.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)