[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/21] qemu: Split machine_ppc.py acceptance tests
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 16/21] qemu: Split machine_ppc.py acceptance tests |
Date: |
Mon, 27 Sep 2021 19:02:22 +0200 |
From: David Gibson <david@gibson.dropbear.id.au>
machine_ppc.py contains tests for 3 different ppc based machine types. It
is listed in MAINTAINERS along with the PPC TCG cpu code. That's not
really accurate though, since it's really more about testing those machines
than the CPUs.
Therefore, split it up into separate files for the separate machine types,
and list those along with their machine types in MAINTAINERS.
Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210927044808.73391-2-david@gibson.dropbear.id.au>
---
MAINTAINERS | 4 +-
tests/acceptance/machine_ppc.py | 69 ----------------------------
tests/acceptance/ppc_mpc8544ds.py | 32 +++++++++++++
tests/acceptance/ppc_pseries.py | 35 ++++++++++++++
tests/acceptance/ppc_virtex_ml507.py | 34 ++++++++++++++
5 files changed, 104 insertions(+), 70 deletions(-)
delete mode 100644 tests/acceptance/machine_ppc.py
create mode 100644 tests/acceptance/ppc_mpc8544ds.py
create mode 100644 tests/acceptance/ppc_pseries.py
create mode 100644 tests/acceptance/ppc_virtex_ml507.py
diff --git a/MAINTAINERS b/MAINTAINERS
index f98523cfe0f..bf1fc5b21e8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -274,7 +274,6 @@ 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>
@@ -1270,6 +1269,7 @@ L: qemu-ppc@nongnu.org
S: Odd Fixes
F: hw/ppc/mpc8544ds.c
F: hw/ppc/mpc8544_guts.c
+F: tests/acceptance/ppc_mpc8544ds.py
New World (mac99)
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -1340,6 +1340,7 @@ F: tests/qtest/spapr*
F: tests/qtest/libqos/*spapr*
F: tests/qtest/rtas*
F: tests/qtest/libqos/rtas*
+F: tests/acceptance/ppc_pseries.py
PowerNV (Non-Virtualized)
M: Cédric Le Goater <clg@kaod.org>
@@ -1361,6 +1362,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
L: qemu-ppc@nongnu.org
S: Odd Fixes
F: hw/ppc/virtex_ml507.c
+F: tests/acceptance/ppc_virtex_ml507.py
sam460ex
M: BALATON Zoltan <balaton@eik.bme.hu>
diff --git a/tests/acceptance/machine_ppc.py b/tests/acceptance/machine_ppc.py
deleted file mode 100644
index a836e2496f1..00000000000
--- a/tests/acceptance/machine_ppc.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.utils import archive
-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)
-
- def test_ppc_mpc8544ds(self):
- """
- :avocado: tags=arch:ppc
- :avocado: tags=machine:mpc8544ds
- """
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/day17.tar.gz')
- tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
- file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
- archive.extract(file_path, self.workdir)
- self.vm.set_console()
- self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
- self.vm.launch()
- wait_for_console_pattern(self, 'QEMU advent calendar 2020',
- self.panic_message)
-
- def test_ppc_virtex_ml507(self):
- """
- :avocado: tags=arch:ppc
- :avocado: tags=machine:virtex-ml507
- """
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/hippo.tar.gz')
- tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
- file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
- archive.extract(file_path, self.workdir)
- self.vm.set_console()
- self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
- '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
- '-m', '512')
- self.vm.launch()
- wait_for_console_pattern(self, 'QEMU advent calendar 2020',
- self.panic_message)
diff --git a/tests/acceptance/ppc_mpc8544ds.py
b/tests/acceptance/ppc_mpc8544ds.py
new file mode 100644
index 00000000000..ce840600c1c
--- /dev/null
+++ b/tests/acceptance/ppc_mpc8544ds.py
@@ -0,0 +1,32 @@
+# 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.utils import archive
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class Mpc8544dsMachine(Test):
+
+ timeout = 90
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+ panic_message = 'Kernel panic - not syncing'
+
+ def test_ppc_mpc8544ds(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:mpc8544ds
+ """
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2020/download/day17.tar.gz')
+ tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ archive.extract(file_path, self.workdir)
+ self.vm.set_console()
+ self.vm.add_args('-kernel', self.workdir + '/creek/creek.bin')
+ self.vm.launch()
+ wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+ self.panic_message)
diff --git a/tests/acceptance/ppc_pseries.py b/tests/acceptance/ppc_pseries.py
new file mode 100644
index 00000000000..f14a884ee16
--- /dev/null
+++ b/tests/acceptance/ppc_pseries.py
@@ -0,0 +1,35 @@
+# 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.utils import archive
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class pseriesMachine(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)
diff --git a/tests/acceptance/ppc_virtex_ml507.py
b/tests/acceptance/ppc_virtex_ml507.py
new file mode 100644
index 00000000000..27f7bf2d492
--- /dev/null
+++ b/tests/acceptance/ppc_virtex_ml507.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.utils import archive
+from avocado_qemu import Test
+from avocado_qemu import wait_for_console_pattern
+
+class VirtexMl507Machine(Test):
+
+ timeout = 90
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+ panic_message = 'Kernel panic - not syncing'
+
+ def test_ppc_virtex_ml507(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:virtex-ml507
+ """
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2020/download/hippo.tar.gz')
+ tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ archive.extract(file_path, self.workdir)
+ self.vm.set_console()
+ self.vm.add_args('-kernel', self.workdir + '/hippo/hippo.linux',
+ '-dtb', self.workdir + '/hippo/virtex440-ml507.dtb',
+ '-m', '512')
+ self.vm.launch()
+ wait_for_console_pattern(self, 'QEMU advent calendar 2020',
+ self.panic_message)
--
2.31.1
- [PULL 07/21] Acceptance Tests: add standard clean up at test tearDown(), (continued)
- [PULL 07/21] Acceptance Tests: add standard clean up at test tearDown(), Philippe Mathieu-Daudé, 2021/09/27
- [PULL 08/21] avocado_qemu: standardize super() call following PEP3135, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 05/21] tests/acceptance: Linux boot test for record/replay, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 09/21] avocado_qemu: fix import module based on isort, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 10/21] avocado_qemu: tweak ssh connect method, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 11/21] avocado_qemu: explicitly return None to avoid R1710, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 12/21] avocado_qemu: fix inheritance order on LinuxTest class, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 13/21] tests/Makefile: allow control over tags during check-acceptance, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 14/21] docs/devel/testing: add instruction to run a single acceptance test, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 15/21] tests/Makefile: add AVOCADO_TESTS option to make check-acceptance, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 16/21] qemu: Split machine_ppc.py acceptance tests,
Philippe Mathieu-Daudé <=
- [PULL 18/21] acceptance/tests/vnc.py: use explicit syntax for enabling passwords, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 17/21] Acceptance Tests: improve check-acceptance description, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 19/21] tests/acceptance/boot_xen.py: removed unused import, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 21/21] tests/acceptance/ppc_prep_40p.py: clean up unused import, Philippe Mathieu-Daudé, 2021/09/27
- [PULL 20/21] tests/acceptance/ppc_prep_40p.py: NetBSD 7.1.2 location update, Philippe Mathieu-Daudé, 2021/09/27
- Re: [PULL 00/21] Integration testing patches for 2021-09-27, Philippe Mathieu-Daudé, 2021/09/27