[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate fi
From: |
David Gibson |
Subject: |
Re: [PATCH 1/3] tests/acceptance: Move the pseries test to a separate file |
Date: |
Wed, 13 Jan 2021 12:14:33 +1100 |
On Tue, Jan 12, 2021 at 05:40:43PM +0100, Thomas Huth wrote:
> Let's gather the POWER-related tests in a separate file.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> MAINTAINERS | 1 +
> tests/acceptance/boot_linux_console.py | 19 --------------
> tests/acceptance/machine_ppc.py | 34 ++++++++++++++++++++++++++
> 3 files changed, 35 insertions(+), 19 deletions(-)
> create mode 100644 tests/acceptance/machine_ppc.py
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4be087b88e..189776a036 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -280,6 +280,7 @@ F: target/ppc/
> F: hw/ppc/
> F: include/hw/ppc/
> F: disas/ppc.c
> +F: tests/acceptance/machine_ppc.py
>
> RISC-V TCG CPUs
> M: Palmer Dabbelt <palmer@dabbelt.com>
> diff --git a/tests/acceptance/boot_linux_console.py
> b/tests/acceptance/boot_linux_console.py
> index fb41bb7144..41d2c86e98 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -976,25 +976,6 @@ class BootLinuxConsole(LinuxKernelTest):
> console_pattern = 'Kernel command line: %s' % kernel_command_line
> self.wait_for_console_pattern(console_pattern)
>
> - def test_ppc64_pseries(self):
> - """
> - :avocado: tags=arch:ppc64
> - :avocado: tags=machine:pseries
> - """
> - kernel_url = ('https://archives.fedoraproject.org/pub/archive'
> - '/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()
> - kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE +
> 'console=hvc0'
> - self.vm.add_args('-kernel', kernel_path,
> - '-append', kernel_command_line)
> - self.vm.launch()
> - console_pattern = 'Kernel command line: %s' % kernel_command_line
> - self.wait_for_console_pattern(console_pattern)
> -
> def test_m68k_q800(self):
> """
> :avocado: tags=arch:m68k
> diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc.py
> new file mode 100644
> index 0000000000..51bbfd411c
> --- /dev/null
> +++ b/tests/acceptance/machine_ppc.py
> @@ -0,0 +1,34 @@
> +# Test that Linux kernel boots on ppc machines and check the console
> +#
> +# Copyright (c) 2018, 2020 Red Hat, Inc.
> +#
> +# 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 avocado_qemu import Test
> +from avocado_qemu import wait_for_console_pattern
> +
> +class PpcMachine(Test):
> +
> + timeout = 90
> + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
> + panic_message = 'Kernel panic - not syncing'
> +
> + def test_ppc64_pseries(self):
> + """
> + :avocado: tags=arch:ppc64
> + :avocado: tags=machine:pseries
> + """
> + kernel_url = ('https://archives.fedoraproject.org/pub/archive'
> + '/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()
> + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE +
> 'console=hvc0'
> + self.vm.add_args('-kernel', kernel_path,
> + '-append', kernel_command_line)
> + self.vm.launch()
> + console_pattern = 'Kernel command line: %s' % kernel_command_line
> + wait_for_console_pattern(self, console_pattern, self.panic_message)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature