diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 14:04:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 14:04:20 +0000 |
| commit | ef80b99ce7ffbd66b3efd493f4ca99f8abf59e79 (patch) | |
| tree | 6a81d63dd33aac4e490d4a0f56c64880e190c196 /tests/cdrom-test.c | |
| parent | 59a568b57848b10e8a44518a889323f12ccdd8f4 (diff) | |
| parent | 4300dadc00bec6d75283ffbe1fd85c2b442bef2d (diff) | |
| download | focaccia-qemu-ef80b99ce7ffbd66b3efd493f4ca99f8abf59e79.tar.gz focaccia-qemu-ef80b99ce7ffbd66b3efd493f4ca99f8abf59e79.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-220219-1' into staging
Various testing fixes: - Travis updates (inc disable isapc cdrom test) - Add gitlab control - Fix docker image - keep softloat tests short # gpg: Signature made Fri 22 Feb 2019 09:51:36 GMT # gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full] # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * remotes/stsquad/tags/pull-testing-next-220219-1: tests/cdrom-test: only include isapc cdrom test when g_test_slow() tests/softfloat: always do quick softfloat tests Add a gitlab-ci file for Continuous Integration testing on Gitlab tests/docker: peg netmap code to a specific version tests/docker: squash initial update and install step for debian9 .travis.yml: Remove disable-uuid .travis.yml: Test with disable-replication .travis.yml: split debug builds .travis.yml: the xcode10 image seems to be hosed Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/cdrom-test.c')
| -rw-r--r-- | tests/cdrom-test.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c index 14bd981336..05611da648 100644 --- a/tests/cdrom-test.c +++ b/tests/cdrom-test.c @@ -132,8 +132,14 @@ static void add_x86_tests(void) qtest_add_data_func("cdrom/boot/virtio-scsi", "-device virtio-scsi -device scsi-cd,drive=cdr " "-blockdev file,node-name=cdr,filename=", test_cdboot); - qtest_add_data_func("cdrom/boot/isapc", "-M isapc " - "-drive if=ide,media=cdrom,file=", test_cdboot); + /* + * Unstable CI test under load + * See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html + */ + if (g_test_slow()) { + qtest_add_data_func("cdrom/boot/isapc", "-M isapc " + "-drive if=ide,media=cdrom,file=", test_cdboot); + } qtest_add_data_func("cdrom/boot/am53c974", "-device am53c974 -device scsi-cd,drive=cd1 " "-drive if=none,id=cd1,format=raw,file=", test_cdboot); |