[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 2/8] tests/unit/test-smp-parse: Split the 'generic' test in va
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 2/8] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid |
Date: |
Wed, 15 Dec 2021 17:48:50 +0100 |
Split the 'generic' test in two tests: 'valid' and 'invalid'.
This will allow us to remove the hack which modifies the
MachineClass internal state.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/unit/test-smp-parse.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 37c6b4981db..425ed6b6b92 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -487,7 +487,7 @@ static void machine_base_class_init(ObjectClass *oc, void
*data)
mc->name = g_strdup(SMP_MACHINE_NAME);
}
-static void test_generic(const void *opaque)
+static void test_generic_valid(const void *opaque)
{
const char *machine_type = opaque;
Object *obj = object_new(machine_type);
@@ -508,6 +508,18 @@ static void test_generic(const void *opaque)
smp_parse_test(ms, data, true);
}
+ object_unref(obj);
+}
+
+static void test_generic_invalid(const void *opaque)
+{
+ const char *machine_type = opaque;
+ Object *obj = object_new(machine_type);
+ MachineState *ms = MACHINE(obj);
+ MachineClass *mc = MACHINE_GET_CLASS(obj);
+ SMPTestData *data = &(SMPTestData){};
+ int i;
+
/* Force invalid min CPUs and max CPUs */
mc->min_cpus = 2;
mc->max_cpus = 511;
@@ -601,9 +613,12 @@ int main(int argc, char *argv[])
g_test_init(&argc, &argv, NULL);
- g_test_add_data_func("/test-smp-parse/generic",
+ g_test_add_data_func("/test-smp-parse/generic/valid",
TYPE_MACHINE,
- test_generic);
+ test_generic_valid);
+ g_test_add_data_func("/test-smp-parse/generic/invalid",
+ TYPE_MACHINE,
+ test_generic_invalid);
g_test_add_data_func("/test-smp-parse/with_dies",
TYPE_MACHINE,
test_with_dies);
--
2.33.1
- [PATCH v5 0/8] tests/unit: Rework test-smp-parse tests, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 1/8] tests/unit/test-smp-parse: Pass machine type as argument to tests, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 4/8] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 3/8] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 2/8] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid,
Philippe Mathieu-Daudé <=
- [PATCH v5 5/8] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 7/8] tests/unit/test-smp-parse: Constify some pointer/struct, Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 8/8] hw/core: Rename smp_parse() -> machine_parse_smp_config(), Philippe Mathieu-Daudé, 2021/12/15
- [PATCH v5 6/8] tests/unit/test-smp-parse: Simplify pointer to compound literal use, Philippe Mathieu-Daudé, 2021/12/15