aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-10-07 12:55:02 +0100
committerPeter Maydell <peter.maydell@linaro.org>2024-10-07 12:55:02 +0100
commit2af37e791906cfda42cb9604a16d218e56994bb1 (patch)
treecb29e76c0d218e0080476ded3a9fcfb7e635aa9e /tests
parentb5ab62b3c0050612c7f9b0b4baeb44ebab42775a (diff)
parentd841f720c98475c0f67695d99f27794bde69ed6e (diff)
downloadqemu-2af37e791906cfda42cb9604a16d218e56994bb1.zip
qemu-2af37e791906cfda42cb9604a16d218e56994bb1.tar.gz
qemu-2af37e791906cfda42cb9604a16d218e56994bb1.tar.bz2
Merge tag 'pull-request-2024-10-07' of https://gitlab.com/thuth/qemu into staging
* Mark "gluster" support as deprecated * Update CI to use macOS 14 instead of 13, and add a macOS 15 job * Use gitlab mirror for advent calendar test images (seems more stable) * Bump timeouts of some tests * Remove CRIS disassembler * Some m68k and s390x cleanups with regards to load and store APIs # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmcDyq4RHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbU8GQ/8DHcRdrkyqlauH9y41sDnMvKuRley5umw # kilvQIRUlNHucqP/kHHQgdf35IF2yxWAoLKjZi/oK90SjSgKCgeRjBzn03dHBGdS # Klret8LTNJGXm7qMQIs/0Pt0fa3Lswzd26xpkTaH0IITMi8yjiwgk6sEE/nSkURB # vCn2lUfCvWd819+E0rE2ZicI9C6ioNZVm+1imofEgmvtT51it9f4PWSnep88gF8k # qSy6HYNdnGjU+R9tY9Xkg7l3IU51AjulW4ZPBO1gDo3dV+t4j85Zn+2wLuAST6hB # TMOHEvrUdT9xc5w+C3btYmgsdbsyZwZSmZd/ChsDGLSfnFMA+W6d3NhdhVIHppyQ # j4f2evc9bFqNTpcnyUOsgnBlrFImcQMsBJTxqW7LaOLAJCuGzg6F6Ek9sm/oCzYl # uGLQeHaKEXZ21G8haXKiy1DUnPfpfkpzNvL+d6dBFtjrWYr2DV0ejbRWRclKoHmG # M4gAHlNodvwjIo1Ik46YZzMgwWbfDGNKfQswZkb8asHUyir5MLR6998fWjIf9wYD # 4mR0WKNF3aBB9rkNcu59sE2bbn2zBshNyPWmgRGCNzdLAcec4jJCCMGkCoVEPj8S # Kng0aTZMgQU5Ify63C3PSrWu2SOinKhxsAz3EfsopDgDUR0ozzpd8G68GCQceKA/ # NF4WN23Vf2o= # =6TD1 # -----END PGP SIGNATURE----- # gpg: Signature made Mon 07 Oct 2024 12:49:02 BST # 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 * tag 'pull-request-2024-10-07' of https://gitlab.com/thuth/qemu: tests/functional: Bump timeout of some tests tests/functional: Switch back to the gitlab URLs for the advent calendar tests target/s390x: Use explicit big-endian LD/ST API target/s390x: Replace ldtul_p() -> ldq_p() hw/s390x: Use explicit big-endian LD/ST API target/m68k: Use explicit big-endian LD/ST API hw/m68k: Use explicit big-endian LD/ST API gitlab-ci/build-oss-fuzz: print FAILED marker in case the test failed and run all tests disas: Remove CRIS disassembler .gitlab-ci.d/cirrus: Add manual testing of macOS 15 (Sequoia) .gitlab-ci.d/cirrus: Drop support for macOS 13 (Ventura) docs: Mark "gluster" support in QEMU as deprecated Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/docker/dockerfiles/opensuse-leap.docker2
-rw-r--r--tests/functional/meson.build9
-rwxr-xr-xtests/functional/test_arm_vexpress.py2
-rwxr-xr-xtests/functional/test_m68k_mcf5208evb.py2
-rwxr-xr-xtests/functional/test_or1k_sim.py2
-rwxr-xr-xtests/functional/test_ppc64_e500.py2
-rwxr-xr-xtests/functional/test_ppc_mac.py2
-rwxr-xr-xtests/functional/test_sh4_r2d.py2
-rwxr-xr-xtests/functional/test_sparc_sun4m.py2
-rwxr-xr-xtests/functional/test_xtensa_lx60.py2
m---------tests/lcitool/libvirt-ci0
-rwxr-xr-xtests/lcitool/refresh2
12 files changed, 16 insertions, 13 deletions
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 6614362..0dab4e4 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.opensuse.org/opensuse/leap:15.5
+FROM registry.opensuse.org/opensuse/leap:15.6
RUN zypper update -y && \
zypper install -y \
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 7713f8e..c90c025 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -11,15 +11,18 @@ endif
# Timeouts for individual tests that can be slow e.g. with debugging enabled
test_timeouts = {
+ 'aarch64_raspi4' : 120,
'aarch64_sbsaref' : 600,
'aarch64_virt' : 360,
'acpi_bits' : 240,
+ 'arm_raspi2' : 120,
+ 'mips_malta' : 120,
'netdev_ethtool' : 180,
'ppc_40p' : 240,
'ppc64_hv' : 1000,
- 'ppc64_powernv' : 120,
- 'ppc64_pseries' : 120,
- 's390x_ccw_virtio' : 180,
+ 'ppc64_powernv' : 240,
+ 'ppc64_pseries' : 240,
+ 's390x_ccw_virtio' : 240,
}
tests_generic_system = [
diff --git a/tests/functional/test_arm_vexpress.py b/tests/functional/test_arm_vexpress.py
index cc60151..6bd6290 100755
--- a/tests/functional/test_arm_vexpress.py
+++ b/tests/functional/test_arm_vexpress.py
@@ -11,7 +11,7 @@ from qemu_test.utils import archive_extract
class VExpressTest(LinuxKernelTest):
ASSET_DAY16 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day16.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day16.tar.xz',
'63311adb2d4c4e7a73214a86d29988add87266a909719c56acfadd026b4110a7')
def test_arm_vexpressa9(self):
diff --git a/tests/functional/test_m68k_mcf5208evb.py b/tests/functional/test_m68k_mcf5208evb.py
index 869ccc8..00c5959 100755
--- a/tests/functional/test_m68k_mcf5208evb.py
+++ b/tests/functional/test_m68k_mcf5208evb.py
@@ -13,7 +13,7 @@ from qemu_test.utils import archive_extract
class Mcf5208EvbTest(LinuxKernelTest):
ASSET_DAY07 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day07.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day07.tar.xz',
'753c2f3837126b7c6ba92d0b1e0b156e8a2c5131d2d576bb0b9a763fae73c08a')
def test_m68k_mcf5208evb(self):
diff --git a/tests/functional/test_or1k_sim.py b/tests/functional/test_or1k_sim.py
index aa2a1f0..10e0437 100755
--- a/tests/functional/test_or1k_sim.py
+++ b/tests/functional/test_or1k_sim.py
@@ -13,7 +13,7 @@ from qemu_test.utils import archive_extract
class OpenRISC1kSimTest(LinuxKernelTest):
ASSET_DAY20 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day20.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz',
'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a')
def test_or1k_sim(self):
diff --git a/tests/functional/test_ppc64_e500.py b/tests/functional/test_ppc64_e500.py
index 3558ae0..f1af923 100755
--- a/tests/functional/test_ppc64_e500.py
+++ b/tests/functional/test_ppc64_e500.py
@@ -10,7 +10,7 @@ from qemu_test.utils import archive_extract
class E500Test(LinuxKernelTest):
ASSET_DAY19 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day19.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day19.tar.xz',
'20b1bb5a8488c664defbb5d283addc91a05335a936c63b3f5ff7eee74b725755')
def test_ppc64_e500(self):
diff --git a/tests/functional/test_ppc_mac.py b/tests/functional/test_ppc_mac.py
index a6b1ca2..3f45e37 100755
--- a/tests/functional/test_ppc_mac.py
+++ b/tests/functional/test_ppc_mac.py
@@ -10,7 +10,7 @@ from qemu_test.utils import archive_extract
class MacTest(LinuxKernelTest):
ASSET_DAY15 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day15.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day15.tar.xz',
'03e0757c131d2959decf293a3572d3b96c5a53587165bf05ce41b2818a2bccd5')
def do_day15_test(self):
diff --git a/tests/functional/test_sh4_r2d.py b/tests/functional/test_sh4_r2d.py
index 5fe8cf9..c3cfff7 100755
--- a/tests/functional/test_sh4_r2d.py
+++ b/tests/functional/test_sh4_r2d.py
@@ -13,7 +13,7 @@ from unittest import skipUnless
class R2dTest(LinuxKernelTest):
ASSET_DAY09 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day09.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day09.tar.xz',
'a61b44d2630a739d1380cc4ff4b80981d47ccfd5992f1484ccf48322c35f09ac')
# This test has a 6-10% failure rate on various hosts that look
diff --git a/tests/functional/test_sparc_sun4m.py b/tests/functional/test_sparc_sun4m.py
index b334375..573f852 100755
--- a/tests/functional/test_sparc_sun4m.py
+++ b/tests/functional/test_sparc_sun4m.py
@@ -11,7 +11,7 @@ from qemu_test.utils import archive_extract
class Sun4mTest(LinuxKernelTest):
ASSET_DAY11 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day11.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day11.tar.xz',
'c776533ba756bf4dd3f1fc4c024fb50ef0d853e05c5f5ddf0900a32d1eaa49e0')
def test_sparc_ss20(self):
diff --git a/tests/functional/test_xtensa_lx60.py b/tests/functional/test_xtensa_lx60.py
index 8ce5206..d4ad92d 100755
--- a/tests/functional/test_xtensa_lx60.py
+++ b/tests/functional/test_xtensa_lx60.py
@@ -11,7 +11,7 @@ from qemu_test.utils import archive_extract
class XTensaLX60Test(LinuxKernelTest):
ASSET_DAY02 = Asset(
- 'https://www.qemu-advent-calendar.org/2018/download/day02.tar.xz',
+ 'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day02.tar.xz',
'68ff07f9b3fd3df36d015eb46299ba44748e94bfbb2d5295fddc1a8d4a9fd324')
def test_xtensa_lx60(self):
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
-Subproject 789b4601bce4e01f43fdb6ad4ce5ab4e4667444
+Subproject c0fc6fab5cdc839a70d4148aa9809504bc96196
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index a78219f..3578880 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -202,8 +202,8 @@ try:
# Cirrus packages lists for GitLab
#
generate_cirrus("freebsd-14")
- generate_cirrus("macos-13")
generate_cirrus("macos-14")
+ generate_cirrus("macos-15")
#
# VM packages lists