diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-11-13 21:11:13 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2018-12-17 15:36:40 +0100 |
| commit | ed398a1206035c082bf9553cb627f4c6c6b5b5c1 (patch) | |
| tree | 89f7527453dada83974a078d8ddd73c6f7e03c85 | |
| parent | a2569b001cf6acf9e9e9bcf7dbcd0a9c94d4bd52 (diff) | |
tests/machine-none: Make test independent of global_qtest
Apart from using qmp() in one spot, this test does not have any
dependencies to the global_qtest variable, so we can simply get
rid of it here by replacing the qmp() with qtest_qmp().
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | tests/machine-none-test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/machine-none-test.c b/tests/machine-none-test.c index 2b3b750500..4c6d470798 100644 --- a/tests/machine-none-test.c +++ b/tests/machine-none-test.c @@ -75,6 +75,7 @@ static void test_machine_cpu_cli(void) QDict *response; const char *arch = qtest_get_arch(); const char *cpu_model = get_cpu_model_by_arch(arch); + QTestState *qts; if (!cpu_model) { if (!(!strcmp(arch, "microblaze") || !strcmp(arch, "microblazeel"))) { @@ -83,13 +84,13 @@ static void test_machine_cpu_cli(void) } return; /* TODO: die here to force all targets have a test */ } - global_qtest = qtest_initf("-machine none -cpu '%s'", cpu_model); + qts = qtest_initf("-machine none -cpu '%s'", cpu_model); - response = qmp("{ 'execute': 'quit' }"); + response = qtest_qmp(qts, "{ 'execute': 'quit' }"); g_assert(qdict_haskey(response, "return")); qobject_unref(response); - qtest_quit(global_qtest); + qtest_quit(qts); } int main(int argc, char **argv) |