72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
From fad259cf9996dbc4001cb94ec3c846d649401027 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:35:43 +0100
|
|
Subject: [PATCH 03/24] tests/unit/test-smp-parse: Split the 'generic' test in
|
|
valid / invalid
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Message-Id: <20211216132015.815493-3-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 37c6b4981d..425ed6b6b9 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_valid);
|
|
+ g_test_add_data_func("/test-smp-parse/generic/invalid",
|
|
TYPE_MACHINE,
|
|
- test_generic);
|
|
+ test_generic_invalid);
|
|
g_test_add_data_func("/test-smp-parse/with_dies",
|
|
TYPE_MACHINE,
|
|
test_with_dies);
|
|
--
|
|
2.27.0
|
|
|