mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/functional: Convert the RV32-on-RV64 riscv test

Browse Source 
A straggler that has been added to the Avocado framework while the
conversion to the functional framework was already in progress...
Move it over now, too!

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Message-ID: <20241105103519.341304-1-thuth@redhat.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Thomas Huth 2024-11-05 11:35:19 +01:00 committed by Alistair Francis
parent 13d438502b
commit 27652f9ca9
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/avocado/tuxrun_baselines.py
View File

@ -222,19 +222,3 @@ class TuxRunBaselineTest(QemuSystemTest):
"rootfs.ext4.zst" : "rootfs.ext4.zst" :
"e6ffd8813c8a335bc15728f2835f90539c84be7f8f5f691a8b01451b47fb4bd7"} "e6ffd8813c8a335bc15728f2835f90539c84be7f8f5f691a8b01451b47fb4bd7"}
self.common_tuxrun(csums=sums) self.common_tuxrun(csums=sums)
def test_riscv64_rv32(self):
"""
:avocado: tags=arch:riscv64
:avocado: tags=machine:virt
:avocado: tags=tuxboot:riscv32
:avocado: tags=cpu:rv32
"""
sums = { "Image" :
"89599407d7334de629a40e7ad6503c73670359eb5f5ae9d686353a3d6deccbd5",
"fw_jump.elf" :
"f2ef28a0b77826f79d085d3e4aa686f1159b315eff9099a37046b18936676985",
"rootfs.ext4.zst" :
"7168d296d0283238ea73cd5a775b3dd608e55e04c7b92b76ecce31bb13108cba" }
self.common_tuxrun(csums=sums)

13
tests/functional/test_riscv64_tuxrun.py
View File

@ -23,6 +23,13 @@ class TuxRunRiscV64Test(TuxRunBaselineTest):
'https://storage.tuxboot.com/20230331/riscv64/rootfs.ext4.zst', 'https://storage.tuxboot.com/20230331/riscv64/rootfs.ext4.zst',
'b18e3a3bdf27be03da0b285e84cb71bf09eca071c3a087b42884b6982ed679eb') 'b18e3a3bdf27be03da0b285e84cb71bf09eca071c3a087b42884b6982ed679eb')
ASSET_RISCV32_KERNEL = Asset(
'https://storage.tuxboot.com/20230331/riscv32/Image',
'89599407d7334de629a40e7ad6503c73670359eb5f5ae9d686353a3d6deccbd5')
ASSET_RISCV32_ROOTFS = Asset(
'https://storage.tuxboot.com/20230331/riscv32/rootfs.ext4.zst',
'7168d296d0283238ea73cd5a775b3dd608e55e04c7b92b76ecce31bb13108cba')
def test_riscv64(self): def test_riscv64(self):
self.set_machine('virt') self.set_machine('virt')
self.common_tuxrun(kernel_asset=self.ASSET_RISCV64_KERNEL, self.common_tuxrun(kernel_asset=self.ASSET_RISCV64_KERNEL,
@ -34,5 +41,11 @@ class TuxRunRiscV64Test(TuxRunBaselineTest):
self.common_tuxrun(kernel_asset=self.ASSET_RISCV64_KERNEL, self.common_tuxrun(kernel_asset=self.ASSET_RISCV64_KERNEL,
rootfs_asset=self.ASSET_RISCV64_ROOTFS) rootfs_asset=self.ASSET_RISCV64_ROOTFS)
def test_riscv64_rv32(self):
self.set_machine('virt')
self.cpu='rv32'
self.common_tuxrun(kernel_asset=self.ASSET_RISCV32_KERNEL,
rootfs_asset=self.ASSET_RISCV32_ROOTFS)
if __name__ == '__main__': if __name__ == '__main__':
TuxRunBaselineTest.main() TuxRunBaselineTest.main()