diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-18 14:31:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-18 14:31:06 +0000 |
| commit | e85c577158a2e8e252414959da9ef15c12eec63d (patch) | |
| tree | b94528b6cb2a0682fa1f60a2ea5852ea8a3f2a10 /tests/machine-none-test.c | |
| parent | ec3c927f3d983b277d00fb88e26785c94e545af3 (diff) | |
| parent | fe17cca6bd2cdfb9cc7f29da8e71aa1238bcdba7 (diff) | |
| download | focaccia-qemu-e85c577158a2e8e252414959da9ef15c12eec63d.tar.gz focaccia-qemu-e85c577158a2e8e252414959da9ef15c12eec63d.zip | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-17' into staging
- Replace global_qtest in some tests - Exit boot-serial-test loop if child dies - Sanitize verbose output in biot-tables-test # gpg: Signature made Mon 17 Dec 2018 16:08:07 GMT # gpg: using RSA key 2ED9D774FE702DB5 # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" # gpg: aka "Thomas Huth <thuth@redhat.com>" # gpg: aka "Thomas Huth <huth@tuxfamily.org>" # gpg: aka "Thomas Huth <th.huth@posteo.de>" # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2018-12-17: tests/bios-tables-test: Sanitize test verbose output tests: acpi: remove not used ACPI_READ_GENERIC_ADDRESS macro tests: Exit boot-serial-test loop if child dies tests/pxe: Make test independent of global_qtest tests/prom-env: Make test independent of global_qtest tests/machine-none: Make test independent of global_qtest tests/test-filter: Make tests independent of global_qtest tests/boot-serial: Get rid of global_qtest variable tests/pvpanic: Make the pvpanic test independent of global_qtest tests/vmgenid: Make test independent of global_qtest tests/acpi-utils: Drop dependence on global_qtest ivshmem-test: Drop dependence on global_qtest tests/libqos/pci: Make PCI access functions independent of global_qtest Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/machine-none-test.c')
| -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) |