* [PATCH] tests/functional: Convert the powernv tests from boot_linux_console.py
@ 2024-09-20 15:03 Thomas Huth
2024-09-20 15:37 ` Cédric Le Goater
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Huth @ 2024-09-20 15:03 UTC (permalink / raw)
To: qemu-devel, Frédéric Barrat, Nicholas Piggin,
Cédric Le Goater
Cc: qemu-ppc
Move the tests into the already existing test_ppc64_powernv.py
file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
Based-on: 20240919185749.71222-1-thuth@redhat.com
tests/avocado/boot_linux_console.py | 46 --------------------------
tests/functional/test_ppc64_powernv.py | 42 +++++++++++++++++++++--
2 files changed, 39 insertions(+), 49 deletions(-)
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 759fda9cc8..23d1b3587b 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -907,49 +907,3 @@ def test_arm_ast2600_debian(self):
self.wait_for_console_pattern("SMP: Total of 2 processors activated")
self.wait_for_console_pattern("No filesystem could mount root")
- def do_test_ppc64_powernv(self, proc):
- self.require_accelerator("tcg")
- images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
-
- kernel_url = images_url + 'zImage.epapr'
- kernel_hash = '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd'
- kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash,
- algorithm='sha256')
- self.vm.set_console()
- self.vm.add_args('-kernel', kernel_path,
- '-append', 'console=tty0 console=hvc0',
- '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
- '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
- '-device', 'e1000e,bus=bridge1,addr=0x3',
- '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
- self.vm.launch()
-
- self.wait_for_console_pattern("CPU: " + proc + " generation processor")
- self.wait_for_console_pattern("zImage starting: loaded")
- self.wait_for_console_pattern("Run /init as init process")
- # Device detection output driven by udev probing is sometimes cut off
- # from console output, suspect S14silence-console init script.
-
- def test_ppc_powernv8(self):
- """
- :avocado: tags=arch:ppc64
- :avocado: tags=machine:powernv8
- :avocado: tags=accel:tcg
- """
- self.do_test_ppc64_powernv('P8')
-
- def test_ppc_powernv9(self):
- """
- :avocado: tags=arch:ppc64
- :avocado: tags=machine:powernv9
- :avocado: tags=accel:tcg
- """
- self.do_test_ppc64_powernv('P9')
-
- def test_ppc_powernv10(self):
- """
- :avocado: tags=arch:ppc64
- :avocado: tags=machine:powernv10
- :avocado: tags=accel:tcg
- """
- self.do_test_ppc64_powernv('P10')
diff --git a/tests/functional/test_ppc64_powernv.py b/tests/functional/test_ppc64_powernv.py
index 67497d6404..685e2178ed 100755
--- a/tests/functional/test_ppc64_powernv.py
+++ b/tests/functional/test_ppc64_powernv.py
@@ -7,10 +7,10 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
-from qemu_test import QemuSystemTest, Asset
+from qemu_test import LinuxKernelTest, Asset
from qemu_test import wait_for_console_pattern
-class powernvMachine(QemuSystemTest):
+class powernvMachine(LinuxKernelTest):
timeout = 90
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=hvc0 '
@@ -78,5 +78,41 @@ def test_linux_big_boot(self):
wait_for_console_pattern(self, console_pattern, self.panic_message)
wait_for_console_pattern(self, self.good_message, self.panic_message)
+
+ ASSET_EPAPR_KERNEL = Asset(
+ ('https://github.com/open-power/op-build/releases/download/v2.7/'
+ 'zImage.epapr'),
+ '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd')
+
+ def do_test_ppc64_powernv(self, proc):
+ self.require_accelerator("tcg")
+ kernel_path = self.ASSET_EPAPR_KERNEL.fetch()
+ self.vm.set_console()
+ self.vm.add_args('-kernel', kernel_path,
+ '-append', 'console=tty0 console=hvc0',
+ '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
+ '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
+ '-device', 'e1000e,bus=bridge1,addr=0x3',
+ '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
+ self.vm.launch()
+
+ self.wait_for_console_pattern("CPU: " + proc + " generation processor")
+ self.wait_for_console_pattern("zImage starting: loaded")
+ self.wait_for_console_pattern("Run /init as init process")
+ # Device detection output driven by udev probing is sometimes cut off
+ # from console output, suspect S14silence-console init script.
+
+ def test_powernv8(self):
+ self.set_machine('powernv8')
+ self.do_test_ppc64_powernv('P8')
+
+ def test_powernv9(self):
+ self.set_machine('powernv9')
+ self.do_test_ppc64_powernv('P9')
+
+ def test_powernv10(self):
+ self.set_machine('powernv10')
+ self.do_test_ppc64_powernv('P10')
+
if __name__ == '__main__':
- QemuSystemTest.main()
+ LinuxKernelTest.main()
--
2.46.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tests/functional: Convert the powernv tests from boot_linux_console.py
2024-09-20 15:03 [PATCH] tests/functional: Convert the powernv tests from boot_linux_console.py Thomas Huth
@ 2024-09-20 15:37 ` Cédric Le Goater
0 siblings, 0 replies; 2+ messages in thread
From: Cédric Le Goater @ 2024-09-20 15:37 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Frédéric Barrat,
Nicholas Piggin
Cc: qemu-ppc
On 9/20/24 17:03, Thomas Huth wrote:
> Move the tests into the already existing test_ppc64_powernv.py
> file.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> Based-on: 20240919185749.71222-1-thuth@redhat.com
>
> tests/avocado/boot_linux_console.py | 46 --------------------------
> tests/functional/test_ppc64_powernv.py | 42 +++++++++++++++++++++--
> 2 files changed, 39 insertions(+), 49 deletions(-)
>
> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
> index 759fda9cc8..23d1b3587b 100644
> --- a/tests/avocado/boot_linux_console.py
> +++ b/tests/avocado/boot_linux_console.py
> @@ -907,49 +907,3 @@ def test_arm_ast2600_debian(self):
> self.wait_for_console_pattern("SMP: Total of 2 processors activated")
> self.wait_for_console_pattern("No filesystem could mount root")
>
> - def do_test_ppc64_powernv(self, proc):
> - self.require_accelerator("tcg")
> - images_url = ('https://github.com/open-power/op-build/releases/download/v2.7/')
> -
> - kernel_url = images_url + 'zImage.epapr'
> - kernel_hash = '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd'
> - kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash,
> - algorithm='sha256')
> - self.vm.set_console()
> - self.vm.add_args('-kernel', kernel_path,
> - '-append', 'console=tty0 console=hvc0',
> - '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
> - '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
> - '-device', 'e1000e,bus=bridge1,addr=0x3',
> - '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
> - self.vm.launch()
> -
> - self.wait_for_console_pattern("CPU: " + proc + " generation processor")
> - self.wait_for_console_pattern("zImage starting: loaded")
> - self.wait_for_console_pattern("Run /init as init process")
> - # Device detection output driven by udev probing is sometimes cut off
> - # from console output, suspect S14silence-console init script.
> -
> - def test_ppc_powernv8(self):
> - """
> - :avocado: tags=arch:ppc64
> - :avocado: tags=machine:powernv8
> - :avocado: tags=accel:tcg
> - """
> - self.do_test_ppc64_powernv('P8')
> -
> - def test_ppc_powernv9(self):
> - """
> - :avocado: tags=arch:ppc64
> - :avocado: tags=machine:powernv9
> - :avocado: tags=accel:tcg
> - """
> - self.do_test_ppc64_powernv('P9')
> -
> - def test_ppc_powernv10(self):
> - """
> - :avocado: tags=arch:ppc64
> - :avocado: tags=machine:powernv10
> - :avocado: tags=accel:tcg
> - """
> - self.do_test_ppc64_powernv('P10')
> diff --git a/tests/functional/test_ppc64_powernv.py b/tests/functional/test_ppc64_powernv.py
> index 67497d6404..685e2178ed 100755
> --- a/tests/functional/test_ppc64_powernv.py
> +++ b/tests/functional/test_ppc64_powernv.py
> @@ -7,10 +7,10 @@
> # This work is licensed under the terms of the GNU GPL, version 2 or
> # later. See the COPYING file in the top-level directory.
>
> -from qemu_test import QemuSystemTest, Asset
> +from qemu_test import LinuxKernelTest, Asset
> from qemu_test import wait_for_console_pattern
>
> -class powernvMachine(QemuSystemTest):
> +class powernvMachine(LinuxKernelTest):
>
> timeout = 90
> KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 console=hvc0 '
> @@ -78,5 +78,41 @@ def test_linux_big_boot(self):
> wait_for_console_pattern(self, console_pattern, self.panic_message)
> wait_for_console_pattern(self, self.good_message, self.panic_message)
>
> +
> + ASSET_EPAPR_KERNEL = Asset(
> + ('https://github.com/open-power/op-build/releases/download/v2.7/'
> + 'zImage.epapr'),
> + '0ab237df661727e5392cee97460e8674057a883c5f74381a128fa772588d45cd')
> +
> + def do_test_ppc64_powernv(self, proc):
> + self.require_accelerator("tcg")
> + kernel_path = self.ASSET_EPAPR_KERNEL.fetch()
> + self.vm.set_console()
> + self.vm.add_args('-kernel', kernel_path,
> + '-append', 'console=tty0 console=hvc0',
> + '-device', 'pcie-pci-bridge,id=bridge1,bus=pcie.1,addr=0x0',
> + '-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234',
> + '-device', 'e1000e,bus=bridge1,addr=0x3',
> + '-device', 'nec-usb-xhci,bus=bridge1,addr=0x2')
> + self.vm.launch()
> +
> + self.wait_for_console_pattern("CPU: " + proc + " generation processor")
> + self.wait_for_console_pattern("zImage starting: loaded")
> + self.wait_for_console_pattern("Run /init as init process")
> + # Device detection output driven by udev probing is sometimes cut off
> + # from console output, suspect S14silence-console init script.
> +
> + def test_powernv8(self):
> + self.set_machine('powernv8')
> + self.do_test_ppc64_powernv('P8')
> +
> + def test_powernv9(self):
> + self.set_machine('powernv9')
> + self.do_test_ppc64_powernv('P9')
> +
> + def test_powernv10(self):
> + self.set_machine('powernv10')
> + self.do_test_ppc64_powernv('P10')
> +
> if __name__ == '__main__':
> - QemuSystemTest.main()
> + LinuxKernelTest.main()
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-20 15:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-20 15:03 [PATCH] tests/functional: Convert the powernv tests from boot_linux_console.py Thomas Huth
2024-09-20 15:37 ` Cédric Le Goater
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).