summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/avocado/boot_linux_console.py8
-rw-r--r--tests/avocado/machine_arm_canona1100.py4
-rw-r--r--tests/avocado/machine_microblaze.py4
-rw-r--r--tests/avocado/machine_sparc64_sun4u.py4
-rw-r--r--tests/avocado/ppc_mpc8544ds.py6
-rw-r--r--tests/avocado/ppc_virtex_ml507.py6
-rw-r--r--tests/avocado/replay_kernel.py40
-rw-r--r--tests/qtest/qom-test.c22
8 files changed, 55 insertions, 39 deletions
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 4c9d551f47..ec07c64291 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -793,8 +793,8 @@ class BootLinuxConsole(LinuxKernelTest):
dtb_path = '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb'
dtb_path = self.extract_from_deb(deb_path, dtb_path)
rootfs_url = ('http://storage.kernelci.org/images/rootfs/buildroot/'
- 'kci-2019.02/armel/base/rootfs.ext2.xz')
- rootfs_hash = '692510cb625efda31640d1de0a8d60e26040f061'
+ 'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz')
+ rootfs_hash = 'fae32f337c7b87547b10f42599acf109da8b6d9a'
rootfs_path_xz = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash)
rootfs_path = os.path.join(self.workdir, 'rootfs.cpio')
archive.lzma_uncompress(rootfs_path_xz, rootfs_path)
@@ -1029,8 +1029,8 @@ class BootLinuxConsole(LinuxKernelTest):
self.wait_for_console_pattern(console_pattern)
def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=0):
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day' + day + '.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day' + day + '.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
self.vm.set_console(console_index=console)
diff --git a/tests/avocado/machine_arm_canona1100.py b/tests/avocado/machine_arm_canona1100.py
index 182a0b0513..a42d8b0f2b 100644
--- a/tests/avocado/machine_arm_canona1100.py
+++ b/tests/avocado/machine_arm_canona1100.py
@@ -23,8 +23,8 @@ class CanonA1100Machine(QemuSystemTest):
:avocado: tags=machine:canon-a1100
:avocado: tags=device:pflash_cfi02
"""
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day18.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day18.tar.xz')
tar_hash = '068b5fc4242b29381acee94713509f8a876e9db6'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
diff --git a/tests/avocado/machine_microblaze.py b/tests/avocado/machine_microblaze.py
index 4928920f96..8d0efff30d 100644
--- a/tests/avocado/machine_microblaze.py
+++ b/tests/avocado/machine_microblaze.py
@@ -19,8 +19,8 @@ class MicroblazeMachine(QemuSystemTest):
:avocado: tags=machine:petalogix-s3adsp1800
"""
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day17.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day17.tar.xz')
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
diff --git a/tests/avocado/machine_sparc64_sun4u.py b/tests/avocado/machine_sparc64_sun4u.py
index 458165500e..d333c0ae91 100644
--- a/tests/avocado/machine_sparc64_sun4u.py
+++ b/tests/avocado/machine_sparc64_sun4u.py
@@ -24,8 +24,8 @@ class Sun4uMachine(LinuxKernelTest):
:avocado: tags=arch:sparc64
:avocado: tags=machine:sun4u
"""
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day23.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day23.tar.xz')
tar_hash = '142db83cd974ffadc4f75c8a5cad5bcc5722c240'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
diff --git a/tests/avocado/ppc_mpc8544ds.py b/tests/avocado/ppc_mpc8544ds.py
index 8d6a749201..b599fb1cc9 100644
--- a/tests/avocado/ppc_mpc8544ds.py
+++ b/tests/avocado/ppc_mpc8544ds.py
@@ -22,9 +22,9 @@ class Mpc8544dsMachine(QemuSystemTest):
:avocado: tags=accel:tcg
"""
self.require_accelerator("tcg")
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/day17.tar.gz')
- tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day04.tar.xz')
+ tar_hash = 'f46724d281a9f30fa892d458be7beb7d34dc25f9'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
self.vm.set_console()
diff --git a/tests/avocado/ppc_virtex_ml507.py b/tests/avocado/ppc_virtex_ml507.py
index 6b07686b56..a73f8ae396 100644
--- a/tests/avocado/ppc_virtex_ml507.py
+++ b/tests/avocado/ppc_virtex_ml507.py
@@ -22,9 +22,9 @@ class VirtexMl507Machine(QemuSystemTest):
:avocado: tags=accel:tcg
"""
self.require_accelerator("tcg")
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/hippo.tar.gz')
- tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day08.tar.xz')
+ tar_hash = '74c68f5af7a7b8f21c03097b298f3bb77ff52c1f'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
self.vm.set_console()
diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
index 0b2b0dc692..00a26e4a0c 100644
--- a/tests/avocado/replay_kernel.py
+++ b/tests/avocado/replay_kernel.py
@@ -296,8 +296,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:vexpress-a9
"""
tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day16.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day16.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
dtb_path = self.workdir + '/day16/vexpress-v2p-ca9.dtb'
self.do_test_advcal_2018(file_path, 'winter.zImage',
@@ -309,8 +309,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:mcf5208evb
"""
tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day07.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day07.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'sanity-clause.elf')
@@ -321,8 +321,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:petalogix-s3adsp1800
"""
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day17.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day17.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'ballerina.bin')
@@ -333,8 +333,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=cpu:e5500
"""
tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day19.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day19.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'uImage')
@@ -344,8 +344,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:or1k-sim
"""
tar_hash = '20334cdaf386108c530ff0badaecc955693027dd'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day20.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day20.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'vmlinux')
@@ -355,8 +355,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:10m50-ghrd
"""
tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day14.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day14.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'vmlinux.elf')
@@ -366,8 +366,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:g3beige
"""
tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day15.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day15.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'invaders.elf',
args=('-M', 'graphics=off'))
@@ -378,8 +378,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:mac99
"""
tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day15.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day15.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'invaders.elf',
args=('-M', 'graphics=off'))
@@ -390,8 +390,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=machine:SS-20
"""
tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day11.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day11.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'zImage.elf')
@@ -402,8 +402,8 @@ class ReplayKernelNormal(ReplayKernelBase):
:avocado: tags=cpu:dc233c
"""
tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day02.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day02.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf')
diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
index 7b871b2a31..13510bc349 100644
--- a/tests/qtest/qom-test.c
+++ b/tests/qtest/qom-test.c
@@ -20,6 +20,7 @@ static void test_properties(QTestState *qts, const char *path, bool recurse)
QDict *response, *tuple, *tmp;
QList *list;
QListEntry *entry;
+ GSList *children = NULL, *links = NULL;
g_test_message("Obtaining properties of %s", path);
response = qtest_qmp(qts, "{ 'execute': 'qom-list',"
@@ -41,11 +42,14 @@ static void test_properties(QTestState *qts, const char *path, bool recurse)
if (is_child || is_link) {
child_path = g_strdup_printf("%s/%s",
path, qdict_get_str(tuple, "name"));
- test_properties(qts, child_path, is_child);
- g_free(child_path);
+ if (is_child) {
+ children = g_slist_prepend(children, child_path);
+ } else {
+ links = g_slist_prepend(links, child_path);
+ }
} else {
const char *prop = qdict_get_str(tuple, "name");
- g_test_message("Testing property %s.%s", path, prop);
+ g_test_message("-> %s", prop);
tmp = qtest_qmp(qts,
"{ 'execute': 'qom-get',"
" 'arguments': { 'path': %s, 'property': %s } }",
@@ -55,6 +59,18 @@ static void test_properties(QTestState *qts, const char *path, bool recurse)
qobject_unref(tmp);
}
}
+
+ while (links) {
+ test_properties(qts, links->data, false);
+ g_free(links->data);
+ links = g_slist_delete_link(links, links);
+ }
+ while (children) {
+ test_properties(qts, children->data, true);
+ g_free(children->data);
+ children = g_slist_delete_link(children, children);
+ }
+
qobject_unref(response);
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-11-21 14:19:00 +0100