tests/cdrom-test: only include isapc cdrom test when g_test_slow()

We are seeing instability on our CI runs which has been there since
the test was introduced. I suspect it triggers more on Travis due to
their heavy load.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Alex Bennée 2019-02-21 13:26:28 +00:00
parent 4f575c08ca
commit 4300dadc00

View File

@ -132,8 +132,14 @@ static void add_x86_tests(void)
qtest_add_data_func("cdrom/boot/virtio-scsi", qtest_add_data_func("cdrom/boot/virtio-scsi",
"-device virtio-scsi -device scsi-cd,drive=cdr " "-device virtio-scsi -device scsi-cd,drive=cdr "
"-blockdev file,node-name=cdr,filename=", test_cdboot); "-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", qtest_add_data_func("cdrom/boot/am53c974",
"-device am53c974 -device scsi-cd,drive=cd1 " "-device am53c974 -device scsi-cd,drive=cd1 "
"-drive if=none,id=cd1,format=raw,file=", test_cdboot); "-drive if=none,id=cd1,format=raw,file=", test_cdboot);