Skip to content

Commit

Permalink
tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Yanan Wang <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
philmd committed Dec 31, 2021
1 parent 1ab192f commit c30bdb0
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions tests/unit/test-smp-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c30bdb0

Please sign in to comment.