diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-19 14:54:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-19 14:54:52 +0000 |
| commit | ce42fe17ad2d2459436fdacbc207df3212a58428 (patch) | |
| tree | 79306488414ec5ffead628b6091670ebbebe1d07 /tests | |
| parent | 6de76c5f324904c93e69f9a1e8e4fd0bd6f6b57a (diff) | |
| parent | fc4241827fffc761f0ca41536c1c7d88b1b1d0c4 (diff) | |
| download | qemu-ce42fe17ad2d2459436fdacbc207df3212a58428.zip qemu-ce42fe17ad2d2459436fdacbc207df3212a58428.tar.gz qemu-ce42fe17ad2d2459436fdacbc207df3212a58428.tar.bz2 | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2021-02-19' into staging
* Always build the container images in the gitlab-CI
* Some other small gitlab-CI improvements
* Some qtest fixes
# gpg: Signature made Fri 19 Feb 2021 06:10:20 GMT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2021-02-19:
travis.yml: Limit simultaneous jobs to 3
gitlab-ci.yml: Run check-tcg with TCI
tests/qtest/boot-sector: Check that the guest did not panic
gitlab-ci: Disable vhost-kernel in build-disable job
scripts/checkpatch: Improve the check for authors mangled by the mailing list
gitlab-ci: Display Avocado log content when tests timeout
gitlab: fix inconsistent indentation
gitlab: add fine grained job deps for all build jobs
gitlab: always build container images
tests/qtest/boot-serial-test: Test Virt machine with 'max'
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/boot-sector.c | 9 | ||||
| -rw-r--r-- | tests/qtest/boot-serial-test.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c index 24df5c4..ea8f264 100644 --- a/tests/qtest/boot-sector.c +++ b/tests/qtest/boot-sector.c @@ -138,6 +138,7 @@ void boot_sector_test(QTestState *qts) uint8_t signature_low; uint8_t signature_high; uint16_t signature; + QDict *qrsp, *qret; int i; /* Wait at most 600 seconds (test is slow with TCI and --enable-debug) */ @@ -155,6 +156,14 @@ void boot_sector_test(QTestState *qts) if (signature == SIGNATURE) { break; } + + /* check that guest is still in "running" state and did not panic */ + qrsp = qtest_qmp(qts, "{ 'execute': 'query-status' }"); + qret = qdict_get_qdict(qrsp, "return"); + g_assert_nonnull(qret); + g_assert_cmpstr(qdict_get_try_str(qret, "status"), ==, "running"); + qobject_unref(qrsp); + g_usleep(TEST_DELAY); } diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index b6b1c23..d74509b 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -149,7 +149,7 @@ static testdef_t tests[] = { { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, /* For hppa, force bios to output to serial by disabling graphics. */ { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" }, - { "aarch64", "virt", "-cpu cortex-a57", "TT", sizeof(kernel_aarch64), + { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64), kernel_aarch64 }, { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 }, |