diff options
| author | Peter Maydell | 2017-10-16 19:29:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-16 19:29:38 +0200 |
| commit | e24cdd07216890d24468cdcbdd5a3e60b3e9f23b (patch) | |
| tree | d6d3181b72eeee66cebd40f1f23da623a37421fe /tests/prom-env-test.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | default-configs: Enable CONFIG_VMXNET3_PCI only on x86 (diff) | |
| download | qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.tar.gz qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.tar.xz qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.zip | |
Merge remote-tracking branch 'remotes/huth/tags/pull-request-2017-10-16' into staging
Some m68k, qtest and config improvements
# gpg: Signature made Mon 16 Oct 2017 13:38:03 BST
# gpg: using RSA key 0x2ED9D774FE702DB5
# 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/tags/pull-request-2017-10-16:
default-configs: Enable CONFIG_VMXNET3_PCI only on x86
tests/prom-env: Bump the timeout, and test pseries only in slow mode
tests: use g_new() family of functions
M68K: use g_new() family of functions
hw/m68k: Replace fprintf(stderr, "*\n" with error_report()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/prom-env-test.c')
| -rw-r--r-- | tests/prom-env-test.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c index eac207b30e..bc8b616912 100644 --- a/tests/prom-env-test.c +++ b/tests/prom-env-test.c @@ -1,7 +1,7 @@ /* - * Test OpenBIOS-based machines. + * Test Open-Firmware-based machines. * - * Copyright (c) 2016 Red Hat Inc. + * Copyright (c) 2016, 2017 Red Hat Inc. * * Author: * Thomas Huth <thuth@redhat.com> @@ -30,8 +30,8 @@ static void check_guest_memory(void) uint32_t signature; int i; - /* Poll until code has run and modified memory. Wait at most 120 seconds */ - for (i = 0; i < 12000; ++i) { + /* Poll until code has run and modified memory. Wait at most 600 seconds */ + for (i = 0; i < 60000; ++i) { signature = readl(ADDRESS); if (signature == MAGIC) { break; @@ -78,7 +78,6 @@ int main(int argc, char *argv[]) const char *sparc_machines[] = { "SPARCbook", "Voyager", "SS-20", NULL }; const char *sparc64_machines[] = { "sun4u", NULL }; const char *ppc_machines[] = { "mac99", "g3beige", NULL }; - const char *ppc64_machines[] = { "mac99", "g3beige", "pseries", NULL }; const char *arch = qtest_get_arch(); g_test_init(&argc, &argv, NULL); @@ -86,7 +85,10 @@ int main(int argc, char *argv[]) if (!strcmp(arch, "ppc")) { add_tests(ppc_machines); } else if (!strcmp(arch, "ppc64")) { - add_tests(ppc64_machines); + add_tests(ppc_machines); + if (g_test_slow()) { + qtest_add_data_func("prom-env/pseries", "pseries", test_machine); + } } else if (!strcmp(arch, "sparc")) { add_tests(sparc_machines); } else if (!strcmp(arch, "sparc64")) { |