mirror of https://gitlab.com/qemu-project/qemu
tests/functional: Convert most ppc avocado tests into standalone tests
Nothing thrilling in here, just straight forward conversions. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20240830133841.142644-26-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
239d08aa96
commit
407a688315
|
@ -1453,7 +1453,7 @@ L: qemu-ppc@nongnu.org
|
||||||
S: Orphan
|
S: Orphan
|
||||||
F: hw/ppc/mpc8544ds.c
|
F: hw/ppc/mpc8544ds.c
|
||||||
F: hw/ppc/mpc8544_guts.c
|
F: hw/ppc/mpc8544_guts.c
|
||||||
F: tests/avocado/ppc_mpc8544ds.py
|
F: tests/functional/test_ppc_mpc8544ds.py
|
||||||
|
|
||||||
New World (mac99)
|
New World (mac99)
|
||||||
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
||||||
|
@ -1506,7 +1506,7 @@ F: hw/dma/i82374.c
|
||||||
F: hw/rtc/m48t59-isa.c
|
F: hw/rtc/m48t59-isa.c
|
||||||
F: include/hw/isa/pc87312.h
|
F: include/hw/isa/pc87312.h
|
||||||
F: include/hw/rtc/m48t59.h
|
F: include/hw/rtc/m48t59.h
|
||||||
F: tests/avocado/ppc_prep_40p.py
|
F: tests/functional/test_ppc_40p.py
|
||||||
|
|
||||||
sPAPR (pseries)
|
sPAPR (pseries)
|
||||||
M: Nicholas Piggin <npiggin@gmail.com>
|
M: Nicholas Piggin <npiggin@gmail.com>
|
||||||
|
@ -1530,7 +1530,7 @@ F: tests/qtest/spapr*
|
||||||
F: tests/qtest/libqos/*spapr*
|
F: tests/qtest/libqos/*spapr*
|
||||||
F: tests/qtest/rtas*
|
F: tests/qtest/rtas*
|
||||||
F: tests/qtest/libqos/rtas*
|
F: tests/qtest/libqos/rtas*
|
||||||
F: tests/avocado/ppc_pseries.py
|
F: tests/functional/test_ppc64_pseries.py
|
||||||
F: tests/avocado/ppc_hv_tests.py
|
F: tests/avocado/ppc_hv_tests.py
|
||||||
|
|
||||||
PowerNV (Non-Virtualized)
|
PowerNV (Non-Virtualized)
|
||||||
|
@ -1548,6 +1548,7 @@ F: include/hw/ppc/pnv*
|
||||||
F: include/hw/pci-host/pnv*
|
F: include/hw/pci-host/pnv*
|
||||||
F: pc-bios/skiboot.lid
|
F: pc-bios/skiboot.lid
|
||||||
F: tests/qtest/pnv*
|
F: tests/qtest/pnv*
|
||||||
|
F: tests/functional/test_ppc64_powernv.py
|
||||||
|
|
||||||
pca955x
|
pca955x
|
||||||
M: Glenn Miles <milesg@linux.ibm.com>
|
M: Glenn Miles <milesg@linux.ibm.com>
|
||||||
|
@ -1562,7 +1563,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
||||||
L: qemu-ppc@nongnu.org
|
L: qemu-ppc@nongnu.org
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: hw/ppc/virtex_ml507.c
|
F: hw/ppc/virtex_ml507.c
|
||||||
F: tests/avocado/ppc_virtex_ml507.py
|
F: tests/functional/test_ppc_virtex_ml507.py
|
||||||
|
|
||||||
sam460ex
|
sam460ex
|
||||||
M: BALATON Zoltan <balaton@eik.bme.hu>
|
M: BALATON Zoltan <balaton@eik.bme.hu>
|
||||||
|
|
|
@ -12,6 +12,9 @@ endif
|
||||||
# Timeouts for individual tests that can be slow e.g. with debugging enabled
|
# Timeouts for individual tests that can be slow e.g. with debugging enabled
|
||||||
test_timeouts = {
|
test_timeouts = {
|
||||||
'netdev_ethtool' : 180,
|
'netdev_ethtool' : 180,
|
||||||
|
'ppc_40p' : 240,
|
||||||
|
'ppc64_powernv' : 120,
|
||||||
|
'ppc64_pseries' : 120,
|
||||||
's390x_ccw_virtio' : 180,
|
's390x_ccw_virtio' : 180,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,7 +60,15 @@ tests_ppc_system_quick = [
|
||||||
|
|
||||||
tests_ppc_system_thorough = [
|
tests_ppc_system_thorough = [
|
||||||
'ppc_405',
|
'ppc_405',
|
||||||
|
'ppc_40p',
|
||||||
'ppc_bamboo',
|
'ppc_bamboo',
|
||||||
|
'ppc_mpc8544ds',
|
||||||
|
'ppc_virtex_ml507',
|
||||||
|
]
|
||||||
|
|
||||||
|
tests_ppc64_system_thorough = [
|
||||||
|
'ppc64_powernv',
|
||||||
|
'ppc64_pseries',
|
||||||
]
|
]
|
||||||
|
|
||||||
tests_s390x_system_thorough = [
|
tests_s390x_system_thorough = [
|
||||||
|
|
56
tests/avocado/ppc_powernv.py → tests/functional/test_ppc64_powernv.py
Normal file → Executable file
56
tests/avocado/ppc_powernv.py → tests/functional/test_ppc64_powernv.py
Normal file → Executable file
|
@ -1,3 +1,5 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
# Test that Linux kernel boots on ppc powernv machines and check the console
|
# Test that Linux kernel boots on ppc powernv machines and check the console
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
||||||
|
@ -5,9 +7,8 @@
|
||||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||||
# later. See the COPYING file in the top-level directory.
|
# later. See the COPYING file in the top-level directory.
|
||||||
|
|
||||||
from avocado.utils import archive
|
from qemu_test import QemuSystemTest, Asset
|
||||||
from avocado_qemu import QemuSystemTest
|
from qemu_test import wait_for_console_pattern
|
||||||
from avocado_qemu import wait_for_console_pattern
|
|
||||||
|
|
||||||
class powernvMachine(QemuSystemTest):
|
class powernvMachine(QemuSystemTest):
|
||||||
|
|
||||||
|
@ -16,13 +17,14 @@ class powernvMachine(QemuSystemTest):
|
||||||
panic_message = 'Kernel panic - not syncing'
|
panic_message = 'Kernel panic - not syncing'
|
||||||
good_message = 'VFS: Cannot open root device'
|
good_message = 'VFS: Cannot open root device'
|
||||||
|
|
||||||
|
ASSET_KERNEL = Asset(
|
||||||
|
('https://archives.fedoraproject.org/pub/archive/fedora-secondary/'
|
||||||
|
'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz'),
|
||||||
|
'383c2f5c23bc0d9d32680c3924d3fd7ee25cc5ef97091ac1aa5e1d853422fc5f')
|
||||||
|
|
||||||
def do_test_linux_boot(self, command_line = KERNEL_COMMON_COMMAND_LINE):
|
def do_test_linux_boot(self, command_line = KERNEL_COMMON_COMMAND_LINE):
|
||||||
self.require_accelerator("tcg")
|
self.require_accelerator("tcg")
|
||||||
kernel_url = ('https://archives.fedoraproject.org/pub/archive'
|
kernel_path = self.ASSET_KERNEL.fetch()
|
||||||
'/fedora-secondary/releases/29/Everything/ppc64le/os'
|
|
||||||
'/ppc/ppc64/vmlinuz')
|
|
||||||
kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
|
|
||||||
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
|
||||||
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-kernel', kernel_path,
|
self.vm.add_args('-kernel', kernel_path,
|
||||||
|
@ -30,23 +32,13 @@ class powernvMachine(QemuSystemTest):
|
||||||
self.vm.launch()
|
self.vm.launch()
|
||||||
|
|
||||||
def test_linux_boot(self):
|
def test_linux_boot(self):
|
||||||
"""
|
self.set_machine('powernv')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:powernv
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.do_test_linux_boot()
|
self.do_test_linux_boot()
|
||||||
console_pattern = 'VFS: Cannot open root device'
|
console_pattern = 'VFS: Cannot open root device'
|
||||||
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
||||||
|
|
||||||
def test_linux_smp_boot(self):
|
def test_linux_smp_boot(self):
|
||||||
"""
|
self.set_machine('powernv')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:powernv
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '4')
|
self.vm.add_args('-smp', '4')
|
||||||
self.do_test_linux_boot()
|
self.do_test_linux_boot()
|
||||||
console_pattern = 'smp: Brought up 1 node, 4 CPUs'
|
console_pattern = 'smp: Brought up 1 node, 4 CPUs'
|
||||||
|
@ -54,12 +46,7 @@ class powernvMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
def test_linux_smp_hpt_boot(self):
|
def test_linux_smp_hpt_boot(self):
|
||||||
"""
|
self.set_machine('powernv')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:powernv
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '4')
|
self.vm.add_args('-smp', '4')
|
||||||
self.do_test_linux_boot(self.KERNEL_COMMON_COMMAND_LINE +
|
self.do_test_linux_boot(self.KERNEL_COMMON_COMMAND_LINE +
|
||||||
'disable_radix')
|
'disable_radix')
|
||||||
|
@ -70,12 +57,7 @@ class powernvMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
def test_linux_smt_boot(self):
|
def test_linux_smt_boot(self):
|
||||||
"""
|
self.set_machine('powernv')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:powernv
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '4,threads=4')
|
self.vm.add_args('-smp', '4,threads=4')
|
||||||
self.do_test_linux_boot()
|
self.do_test_linux_boot()
|
||||||
console_pattern = 'CPU maps initialized for 4 threads per core'
|
console_pattern = 'CPU maps initialized for 4 threads per core'
|
||||||
|
@ -85,12 +67,7 @@ class powernvMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
def test_linux_big_boot(self):
|
def test_linux_big_boot(self):
|
||||||
"""
|
self.set_machine('powernv')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:powernv
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '16,threads=4,cores=2,sockets=2')
|
self.vm.add_args('-smp', '16,threads=4,cores=2,sockets=2')
|
||||||
|
|
||||||
# powernv does not support NUMA
|
# powernv does not support NUMA
|
||||||
|
@ -100,3 +77,6 @@ class powernvMachine(QemuSystemTest):
|
||||||
console_pattern = 'smp: Brought up 2 nodes, 16 CPUs'
|
console_pattern = 'smp: Brought up 2 nodes, 16 CPUs'
|
||||||
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
QemuSystemTest.main()
|
56
tests/avocado/ppc_pseries.py → tests/functional/test_ppc64_pseries.py
Normal file → Executable file
56
tests/avocado/ppc_pseries.py → tests/functional/test_ppc64_pseries.py
Normal file → Executable file
|
@ -1,3 +1,5 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
# Test that Linux kernel boots on ppc machines and check the console
|
# Test that Linux kernel boots on ppc machines and check the console
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
||||||
|
@ -5,9 +7,8 @@
|
||||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||||
# later. See the COPYING file in the top-level directory.
|
# later. See the COPYING file in the top-level directory.
|
||||||
|
|
||||||
from avocado.utils import archive
|
from qemu_test import QemuSystemTest, Asset
|
||||||
from avocado_qemu import QemuSystemTest
|
from qemu_test import wait_for_console_pattern
|
||||||
from avocado_qemu import wait_for_console_pattern
|
|
||||||
|
|
||||||
class pseriesMachine(QemuSystemTest):
|
class pseriesMachine(QemuSystemTest):
|
||||||
|
|
||||||
|
@ -16,12 +17,13 @@ class pseriesMachine(QemuSystemTest):
|
||||||
panic_message = 'Kernel panic - not syncing'
|
panic_message = 'Kernel panic - not syncing'
|
||||||
good_message = 'VFS: Cannot open root device'
|
good_message = 'VFS: Cannot open root device'
|
||||||
|
|
||||||
|
ASSET_KERNEL = Asset(
|
||||||
|
('https://archives.fedoraproject.org/pub/archive/fedora-secondary/'
|
||||||
|
'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz'),
|
||||||
|
'383c2f5c23bc0d9d32680c3924d3fd7ee25cc5ef97091ac1aa5e1d853422fc5f')
|
||||||
|
|
||||||
def do_test_ppc64_linux_boot(self, kernel_command_line = KERNEL_COMMON_COMMAND_LINE):
|
def do_test_ppc64_linux_boot(self, kernel_command_line = KERNEL_COMMON_COMMAND_LINE):
|
||||||
kernel_url = ('https://archives.fedoraproject.org/pub/archive'
|
kernel_path = self.ASSET_KERNEL.fetch()
|
||||||
'/fedora-secondary/releases/29/Everything/ppc64le/os'
|
|
||||||
'/ppc/ppc64/vmlinuz')
|
|
||||||
kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
|
|
||||||
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
|
||||||
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-kernel', kernel_path,
|
self.vm.add_args('-kernel', kernel_path,
|
||||||
|
@ -29,32 +31,20 @@ class pseriesMachine(QemuSystemTest):
|
||||||
self.vm.launch()
|
self.vm.launch()
|
||||||
|
|
||||||
def test_ppc64_vof_linux_boot(self):
|
def test_ppc64_vof_linux_boot(self):
|
||||||
"""
|
self.set_machine('pseries')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:pseries
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-machine', 'x-vof=on')
|
self.vm.add_args('-machine', 'x-vof=on')
|
||||||
self.do_test_ppc64_linux_boot()
|
self.do_test_ppc64_linux_boot()
|
||||||
console_pattern = 'VFS: Cannot open root device'
|
console_pattern = 'VFS: Cannot open root device'
|
||||||
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
||||||
|
|
||||||
def test_ppc64_linux_boot(self):
|
def test_ppc64_linux_boot(self):
|
||||||
"""
|
self.set_machine('pseries')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:pseries
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.do_test_ppc64_linux_boot()
|
self.do_test_ppc64_linux_boot()
|
||||||
console_pattern = 'VFS: Cannot open root device'
|
console_pattern = 'VFS: Cannot open root device'
|
||||||
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
||||||
|
|
||||||
def test_ppc64_linux_smp_boot(self):
|
def test_ppc64_linux_smp_boot(self):
|
||||||
"""
|
self.set_machine('pseries')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:pseries
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '4')
|
self.vm.add_args('-smp', '4')
|
||||||
self.do_test_ppc64_linux_boot()
|
self.do_test_ppc64_linux_boot()
|
||||||
console_pattern = 'smp: Brought up 1 node, 4 CPUs'
|
console_pattern = 'smp: Brought up 1 node, 4 CPUs'
|
||||||
|
@ -62,11 +52,7 @@ class pseriesMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
def test_ppc64_linux_hpt_smp_boot(self):
|
def test_ppc64_linux_hpt_smp_boot(self):
|
||||||
"""
|
self.set_machine('pseries')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:pseries
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '4')
|
self.vm.add_args('-smp', '4')
|
||||||
self.do_test_ppc64_linux_boot(self.KERNEL_COMMON_COMMAND_LINE +
|
self.do_test_ppc64_linux_boot(self.KERNEL_COMMON_COMMAND_LINE +
|
||||||
'disable_radix')
|
'disable_radix')
|
||||||
|
@ -77,11 +63,6 @@ class pseriesMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
def test_ppc64_linux_smt_boot(self):
|
def test_ppc64_linux_smt_boot(self):
|
||||||
"""
|
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:pseries
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '4,threads=4')
|
self.vm.add_args('-smp', '4,threads=4')
|
||||||
self.do_test_ppc64_linux_boot()
|
self.do_test_ppc64_linux_boot()
|
||||||
console_pattern = 'CPU maps initialized for 4 threads per core'
|
console_pattern = 'CPU maps initialized for 4 threads per core'
|
||||||
|
@ -91,11 +72,7 @@ class pseriesMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
def test_ppc64_linux_big_boot(self):
|
def test_ppc64_linux_big_boot(self):
|
||||||
"""
|
self.set_machine('pseries')
|
||||||
:avocado: tags=arch:ppc64
|
|
||||||
:avocado: tags=machine:pseries
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.vm.add_args('-smp', '16,threads=4,cores=2,sockets=2')
|
self.vm.add_args('-smp', '16,threads=4,cores=2,sockets=2')
|
||||||
self.vm.add_args('-m', '512M',
|
self.vm.add_args('-m', '512M',
|
||||||
'-object', 'memory-backend-ram,size=256M,id=m0',
|
'-object', 'memory-backend-ram,size=256M,id=m0',
|
||||||
|
@ -108,3 +85,6 @@ class pseriesMachine(QemuSystemTest):
|
||||||
console_pattern = 'smp: Brought up 2 nodes, 16 CPUs'
|
console_pattern = 'smp: Brought up 2 nodes, 16 CPUs'
|
||||||
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
wait_for_console_pattern(self, console_pattern, self.panic_message)
|
||||||
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
wait_for_console_pattern(self, self.good_message, self.panic_message)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
QemuSystemTest.main()
|
|
@ -1,3 +1,5 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
# Functional test that boots a PReP/40p machine and checks its serial console.
|
# Functional test that boots a PReP/40p machine and checks its serial console.
|
||||||
#
|
#
|
||||||
# Copyright (c) Philippe Mathieu-Daudé <f4bug@amsat.org>
|
# Copyright (c) Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||||
|
@ -7,39 +9,40 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from avocado import skipUnless
|
from unittest import skipUnless
|
||||||
from avocado_qemu import QemuSystemTest
|
from qemu_test import QemuSystemTest, Asset
|
||||||
from avocado_qemu import wait_for_console_pattern
|
from qemu_test import wait_for_console_pattern
|
||||||
|
|
||||||
|
|
||||||
class IbmPrep40pMachine(QemuSystemTest):
|
class IbmPrep40pMachine(QemuSystemTest):
|
||||||
|
|
||||||
timeout = 60
|
timeout = 60
|
||||||
|
|
||||||
|
ASSET_BIOS = Asset(
|
||||||
|
('http://ftpmirror.your.org/pub/misc/'
|
||||||
|
'ftp.software.ibm.com/rs6000/firmware/'
|
||||||
|
'7020-40p/P12H0456.IMG'),
|
||||||
|
'd957f79c73f760d1455d2286fcd901ed6d06167320eb73511b478a939be25b3f')
|
||||||
|
ASSET_NETBSD40 = Asset(
|
||||||
|
('https://archive.netbsd.org/pub/NetBSD-archive/'
|
||||||
|
'NetBSD-4.0/prep/installation/floppy/generic_com0.fs'),
|
||||||
|
'f86236e9d01b3f0dd0f5d3b8d5bbd40c68e78b4db560a108358f5ad58e636619')
|
||||||
|
ASSET_NETBSD71 = Asset(
|
||||||
|
('https://archive.netbsd.org/pub/NetBSD-archive/'
|
||||||
|
'NetBSD-7.1.2/iso/NetBSD-7.1.2-prep.iso'),
|
||||||
|
'cc7cb290b06aaa839362deb7bd9f417ac5015557db24088508330f76c3f825ec')
|
||||||
|
|
||||||
# 12H0455 PPS Firmware Licensed Materials
|
# 12H0455 PPS Firmware Licensed Materials
|
||||||
# Property of IBM (C) Copyright IBM Corp. 1994.
|
# Property of IBM (C) Copyright IBM Corp. 1994.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# U.S. Government Users Restricted Rights - Use, duplication or disclosure
|
# U.S. Government Users Restricted Rights - Use, duplication or disclosure
|
||||||
# restricted by GSA ADP Schedule Contract with IBM Corp.
|
# restricted by GSA ADP Schedule Contract with IBM Corp.
|
||||||
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
|
@skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
|
||||||
def test_factory_firmware_and_netbsd(self):
|
def test_factory_firmware_and_netbsd(self):
|
||||||
"""
|
self.set_machine('40p')
|
||||||
:avocado: tags=arch:ppc
|
|
||||||
:avocado: tags=machine:40p
|
|
||||||
:avocado: tags=os:netbsd
|
|
||||||
:avocado: tags=slowness:high
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
self.require_accelerator("tcg")
|
self.require_accelerator("tcg")
|
||||||
bios_url = ('http://ftpmirror.your.org/pub/misc/'
|
bios_path = self.ASSET_BIOS.fetch()
|
||||||
'ftp.software.ibm.com/rs6000/firmware/'
|
drive_path = self.ASSET_NETBSD40.fetch()
|
||||||
'7020-40p/P12H0456.IMG')
|
|
||||||
bios_hash = '1775face4e6dc27f3a6ed955ef6eb331bf817f03'
|
|
||||||
bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash)
|
|
||||||
drive_url = ('https://archive.netbsd.org/pub/NetBSD-archive/'
|
|
||||||
'NetBSD-4.0/prep/installation/floppy/generic_com0.fs')
|
|
||||||
drive_hash = 'dbcfc09912e71bd5f0d82c7c1ee43082fb596ceb'
|
|
||||||
drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash)
|
|
||||||
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-bios', bios_path,
|
self.vm.add_args('-bios', bios_path,
|
||||||
|
@ -50,11 +53,7 @@ class IbmPrep40pMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, 'Model: IBM PPS Model 6015')
|
wait_for_console_pattern(self, 'Model: IBM PPS Model 6015')
|
||||||
|
|
||||||
def test_openbios_192m(self):
|
def test_openbios_192m(self):
|
||||||
"""
|
self.set_machine('40p')
|
||||||
:avocado: tags=arch:ppc
|
|
||||||
:avocado: tags=machine:40p
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
self.require_accelerator("tcg")
|
self.require_accelerator("tcg")
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-m', '192') # test fw_cfg
|
self.vm.add_args('-m', '192') # test fw_cfg
|
||||||
|
@ -65,21 +64,15 @@ class IbmPrep40pMachine(QemuSystemTest):
|
||||||
wait_for_console_pattern(self, '>> CPU type PowerPC,604')
|
wait_for_console_pattern(self, '>> CPU type PowerPC,604')
|
||||||
|
|
||||||
def test_openbios_and_netbsd(self):
|
def test_openbios_and_netbsd(self):
|
||||||
"""
|
self.set_machine('40p')
|
||||||
:avocado: tags=arch:ppc
|
|
||||||
:avocado: tags=machine:40p
|
|
||||||
:avocado: tags=os:netbsd
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
self.require_accelerator("tcg")
|
self.require_accelerator("tcg")
|
||||||
drive_url = ('https://archive.netbsd.org/pub/NetBSD-archive/'
|
drive_path = self.ASSET_NETBSD71.fetch()
|
||||||
'NetBSD-7.1.2/iso/NetBSD-7.1.2-prep.iso')
|
|
||||||
drive_hash = 'ac6fa2707d888b36d6fa64de6e7fe48e'
|
|
||||||
drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash,
|
|
||||||
algorithm='md5')
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-cdrom', drive_path,
|
self.vm.add_args('-cdrom', drive_path,
|
||||||
'-boot', 'd')
|
'-boot', 'd')
|
||||||
|
|
||||||
self.vm.launch()
|
self.vm.launch()
|
||||||
wait_for_console_pattern(self, 'NetBSD/prep BOOT, Revision 1.9')
|
wait_for_console_pattern(self, 'NetBSD/prep BOOT, Revision 1.9')
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
QemuSystemTest.main()
|
29
tests/avocado/ppc_mpc8544ds.py → tests/functional/test_ppc_mpc8544ds.py
Normal file → Executable file
29
tests/avocado/ppc_mpc8544ds.py → tests/functional/test_ppc_mpc8544ds.py
Normal file → Executable file
|
@ -1,3 +1,5 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
# Test that Linux kernel boots on ppc machines and check the console
|
# Test that Linux kernel boots on ppc machines and check the console
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
||||||
|
@ -5,9 +7,9 @@
|
||||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||||
# later. See the COPYING file in the top-level directory.
|
# later. See the COPYING file in the top-level directory.
|
||||||
|
|
||||||
from avocado.utils import archive
|
from qemu_test.utils import archive_extract
|
||||||
from avocado_qemu import QemuSystemTest
|
from qemu_test import QemuSystemTest, Asset
|
||||||
from avocado_qemu import wait_for_console_pattern
|
from qemu_test import wait_for_console_pattern
|
||||||
|
|
||||||
class Mpc8544dsMachine(QemuSystemTest):
|
class Mpc8544dsMachine(QemuSystemTest):
|
||||||
|
|
||||||
|
@ -15,20 +17,21 @@ class Mpc8544dsMachine(QemuSystemTest):
|
||||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||||
panic_message = 'Kernel panic - not syncing'
|
panic_message = 'Kernel panic - not syncing'
|
||||||
|
|
||||||
|
ASSET_IMAGE = Asset(
|
||||||
|
('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/'
|
||||||
|
'day04.tar.xz'),
|
||||||
|
'88bc83f3c9f3d633bcfc108a6342d677abca247066a2fb8d4636744a0d319f94')
|
||||||
|
|
||||||
def test_ppc_mpc8544ds(self):
|
def test_ppc_mpc8544ds(self):
|
||||||
"""
|
|
||||||
:avocado: tags=arch:ppc
|
|
||||||
:avocado: tags=machine:mpc8544ds
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
self.require_accelerator("tcg")
|
self.require_accelerator("tcg")
|
||||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
self.set_machine('mpc8544ds')
|
||||||
'/qac-best-of-multiarch/download/day04.tar.xz')
|
file_path = self.ASSET_IMAGE.fetch()
|
||||||
tar_hash = 'f46724d281a9f30fa892d458be7beb7d34dc25f9'
|
archive_extract(file_path, self.workdir, member='creek/creek.bin')
|
||||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
|
||||||
archive.extract(file_path, self.workdir)
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
|
self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
|
||||||
self.vm.launch()
|
self.vm.launch()
|
||||||
wait_for_console_pattern(self, 'QEMU advent calendar 2020',
|
wait_for_console_pattern(self, 'QEMU advent calendar 2020',
|
||||||
self.panic_message)
|
self.panic_message)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
QemuSystemTest.main()
|
29
tests/avocado/ppc_virtex_ml507.py → tests/functional/test_ppc_virtex_ml507.py
Normal file → Executable file
29
tests/avocado/ppc_virtex_ml507.py → tests/functional/test_ppc_virtex_ml507.py
Normal file → Executable file
|
@ -1,3 +1,5 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
#
|
||||||
# Test that Linux kernel boots on ppc machines and check the console
|
# Test that Linux kernel boots on ppc machines and check the console
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
# Copyright (c) 2018, 2020 Red Hat, Inc.
|
||||||
|
@ -5,9 +7,9 @@
|
||||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||||
# later. See the COPYING file in the top-level directory.
|
# later. See the COPYING file in the top-level directory.
|
||||||
|
|
||||||
from avocado.utils import archive
|
from qemu_test.utils import archive_extract
|
||||||
from avocado_qemu import QemuSystemTest
|
from qemu_test import QemuSystemTest, Asset
|
||||||
from avocado_qemu import wait_for_console_pattern
|
from qemu_test import wait_for_console_pattern
|
||||||
|
|
||||||
class VirtexMl507Machine(QemuSystemTest):
|
class VirtexMl507Machine(QemuSystemTest):
|
||||||
|
|
||||||
|
@ -15,18 +17,16 @@ class VirtexMl507Machine(QemuSystemTest):
|
||||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||||
panic_message = 'Kernel panic - not syncing'
|
panic_message = 'Kernel panic - not syncing'
|
||||||
|
|
||||||
|
ASSET_IMAGE = Asset(
|
||||||
|
('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/'
|
||||||
|
'day08.tar.xz'),
|
||||||
|
'cefe5b8aeb5e9d2d1d4fd22dcf48d917d68d5a765132bf2ddd6332dc393b824c')
|
||||||
|
|
||||||
def test_ppc_virtex_ml507(self):
|
def test_ppc_virtex_ml507(self):
|
||||||
"""
|
|
||||||
:avocado: tags=arch:ppc
|
|
||||||
:avocado: tags=machine:virtex-ml507
|
|
||||||
:avocado: tags=accel:tcg
|
|
||||||
"""
|
|
||||||
self.require_accelerator("tcg")
|
self.require_accelerator("tcg")
|
||||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
self.set_machine('virtex-ml507')
|
||||||
'/qac-best-of-multiarch/download/day08.tar.xz')
|
file_path = self.ASSET_IMAGE.fetch()
|
||||||
tar_hash = '74c68f5af7a7b8f21c03097b298f3bb77ff52c1f'
|
archive_extract(file_path, self.workdir)
|
||||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
|
||||||
archive.extract(file_path, self.workdir)
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
|
self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
|
||||||
'-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
|
'-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
|
||||||
|
@ -34,3 +34,6 @@ class VirtexMl507Machine(QemuSystemTest):
|
||||||
self.vm.launch()
|
self.vm.launch()
|
||||||
wait_for_console_pattern(self, 'QEMU advent calendar 2020',
|
wait_for_console_pattern(self, 'QEMU advent calendar 2020',
|
||||||
self.panic_message)
|
self.panic_message)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
QemuSystemTest.main()
|
Loading…
Reference in New Issue