* [PULL 1/8] MAINTAINERS: Add an entry to review Avocado based acceptance tests
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 2/8] tests/acceptance: add base class record/replay kernel tests Philippe Mathieu-Daudé
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Wainer dos Santos Moschetta, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
Acceptance tests can test any piece of the QEMU codebase.
As such, the directory holding them does not belong to a specific
subsystem with designated maintainers.
Each subsystem covered by a test is welcomed to add the test path
to its section.
See for example commits 71b290e70, b11785ca2 or 5d480ddde.
Add an entry for to allow reviewers to be notified when acceptance /
integration tests are added or modified.
The designated reviewers are not maintainers, subsystem maintainers
are expected to merge their tests.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20200129212345.20547-30-philmd@redhat.com>
Message-Id: <20200605165656.17578-1-philmd@redhat.com>
---
MAINTAINERS | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 955cc8dd5c..7b1262e925 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2941,6 +2941,14 @@ S: Maintained
F: tests/tcg/Makefile
F: tests/tcg/Makefile.include
+Acceptance (Integration) Testing with the Avocado framework
+W: https://trello.com/b/6Qi1pxVn/avocado-qemu
+R: Cleber Rosa <crosa@redhat.com>
+R: Philippe Mathieu-Daudé <philmd@redhat.com>
+R: Wainer dos Santos Moschetta <wainersm@redhat.com>
+S: Odd Fixes
+F: tests/acceptance/
+
Documentation
-------------
Build system architecture
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 2/8] tests/acceptance: add base class record/replay kernel tests
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 1/8] MAINTAINERS: Add an entry to review Avocado based acceptance tests Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 3/8] tests/acceptance: add kernel record/replay test for x86_64 Philippe Mathieu-Daudé
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Wainer dos Santos Moschetta, Pavel Dovgalyuk, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds a base for testing kernel boot recording and replaying.
Each test has the phase of recording and phase of replaying.
Virtual machines just boot the kernel and do not interact with
the network.
Structure and image links for the tests are borrowed from boot_linux_console.py
Testing controls the message pattern at the end of the kernel
boot for both record and replay modes. In replay mode QEMU is also
intended to finish the execution automatically.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <159073589099.20809.14078431743098373301.stgit@pasha-ThinkPad-X280>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: Keep imports sorted alphabetically]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
tests/acceptance/replay_kernel.py | 73 +++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
create mode 100644 tests/acceptance/replay_kernel.py
diff --git a/MAINTAINERS b/MAINTAINERS
index 7b1262e925..dc61830c64 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2534,6 +2534,7 @@ F: net/filter-replay.c
F: include/sysemu/replay.h
F: docs/replay.txt
F: stubs/replay.c
+F: tests/acceptance/replay_kernel.py
IOVA Tree
M: Peter Xu <peterx@redhat.com>
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
new file mode 100644
index 0000000000..90986ca503
--- /dev/null
+++ b/tests/acceptance/replay_kernel.py
@@ -0,0 +1,73 @@
+# Record/replay test that boots a Linux kernel
+#
+# Copyright (c) 2020 ISP RAS
+#
+# Author:
+# Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or
+# later. See the COPYING file in the top-level directory.
+
+import os
+import logging
+import time
+
+from avocado_qemu import wait_for_console_pattern
+from avocado.utils import archive
+from avocado.utils import process
+from boot_linux_console import LinuxKernelTest
+
+class ReplayKernel(LinuxKernelTest):
+ """
+ Boots a Linux kernel in record mode and checks that the console
+ is operational and the kernel command line is properly passed
+ from QEMU to the kernel.
+ Then replays the same scenario and verifies, that QEMU correctly
+ terminates.
+ """
+
+ timeout = 90
+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=1 panic=-1 '
+
+ def run_vm(self, kernel_path, kernel_command_line, console_pattern,
+ record, shift, args, replay_path):
+ logger = logging.getLogger('replay')
+ start_time = time.time()
+ vm = self.get_vm()
+ vm.set_console()
+ if record:
+ logger.info('recording the execution...')
+ mode = 'record'
+ else:
+ logger.info('replaying the execution...')
+ mode = 'replay'
+ vm.add_args('-icount', 'shift=%s,rr=%s,rrfile=%s' %
+ (shift, mode, replay_path),
+ '-kernel', kernel_path,
+ '-append', kernel_command_line,
+ '-net', 'none',
+ '-no-reboot')
+ if args:
+ vm.add_args(*args)
+ vm.launch()
+ self.wait_for_console_pattern(console_pattern, vm)
+ if record:
+ vm.shutdown()
+ logger.info('finished the recording with log size %s bytes'
+ % os.path.getsize(replay_path))
+ else:
+ vm.wait()
+ logger.info('successfully finished the replay')
+ elapsed = time.time() - start_time
+ logger.info('elapsed time %.2f sec' % elapsed)
+ return elapsed
+
+ def run_rr(self, kernel_path, kernel_command_line, console_pattern,
+ shift=7, args=None):
+ replay_path = os.path.join(self.workdir, 'replay.bin')
+ t1 = self.run_vm(kernel_path, kernel_command_line, console_pattern,
+ True, shift, args, replay_path)
+ t2 = self.run_vm(kernel_path, kernel_command_line, console_pattern,
+ False, shift, args, replay_path)
+ logger = logging.getLogger('replay')
+ logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 3/8] tests/acceptance: add kernel record/replay test for x86_64
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 1/8] MAINTAINERS: Add an entry to review Avocado based acceptance tests Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 2/8] tests/acceptance: add base class record/replay kernel tests Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 4/8] tests/acceptance: add record/replay test for aarch64 Philippe Mathieu-Daudé
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Wainer dos Santos Moschetta, Pavel Dovgalyuk, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds a test for record/replay an execution of x86_64 machine.
Execution scenario includes simple kernel boot, which allows testing
basic hardware interaction in RR mode.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <159073589656.20809.14010247947948822435.stgit@pasha-ThinkPad-X280>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: Skip test_x86_64_pc on Travis-CI]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/replay_kernel.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 90986ca503..64956e85f1 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -12,6 +12,7 @@
import logging
import time
+from avocado import skipIf
from avocado_qemu import wait_for_console_pattern
from avocado.utils import archive
from avocado.utils import process
@@ -71,3 +72,20 @@ def run_rr(self, kernel_path, kernel_command_line, console_pattern,
False, shift, args, replay_path)
logger = logging.getLogger('replay')
logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
+
+ @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
+ def test_x86_64_pc(self):
+ """
+ :avocado: tags=arch:x86_64
+ :avocado: tags=machine:pc
+ """
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
+ '/linux/releases/29/Everything/x86_64/os/images/pxeboot'
+ '/vmlinuz')
+ kernel_hash = '23bebd2680757891cf7adedb033532163a792495'
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+ kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
+ console_pattern = 'VFS: Cannot open root device'
+
+ self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 4/8] tests/acceptance: add record/replay test for aarch64
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-06-22 8:59 ` [PULL 3/8] tests/acceptance: add kernel record/replay test for x86_64 Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 5/8] tests/acceptance: add record/replay test for arm Philippe Mathieu-Daudé
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Wainer dos Santos Moschetta, Pavel Dovgalyuk, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds a test for record/replay of the kernel
image boot for aarch64 platform.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <159073590231.20809.9842179251741585482.stgit@pasha-ThinkPad-X280>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/replay_kernel.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 64956e85f1..60559a13ad 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -89,3 +89,22 @@ def test_x86_64_pc(self):
console_pattern = 'VFS: Cannot open root device'
self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=5)
+
+ def test_aarch64_virt(self):
+ """
+ :avocado: tags=arch:aarch64
+ :avocado: tags=machine:virt
+ :avocado: tags=cpu:cortex-a53
+ """
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
+ '/linux/releases/29/Everything/aarch64/os/images/pxeboot'
+ '/vmlinuz')
+ kernel_hash = '8c73e469fc6ea06a58dc83a628fc695b693b8493'
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=ttyAMA0')
+ console_pattern = 'VFS: Cannot open root device'
+
+ self.run_rr(kernel_path, kernel_command_line, console_pattern,
+ args=('-cpu', 'cortex-a53'))
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 5/8] tests/acceptance: add record/replay test for arm
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2020-06-22 8:59 ` [PULL 4/8] tests/acceptance: add record/replay test for aarch64 Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 6/8] tests/acceptance: add record/replay test for ppc64 Philippe Mathieu-Daudé
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Wainer dos Santos Moschetta, Pavel Dovgalyuk, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds a test for record/replay of the kernel
image boot for two different arm platforms.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <159073590785.20809.17654573764167037499.stgit@pasha-ThinkPad-X280>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/replay_kernel.py | 48 +++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 60559a13ad..748c780575 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -108,3 +108,51 @@ def test_aarch64_virt(self):
self.run_rr(kernel_path, kernel_command_line, console_pattern,
args=('-cpu', 'cortex-a53'))
+
+ def test_arm_virt(self):
+ """
+ :avocado: tags=arch:arm
+ :avocado: tags=machine:virt
+ """
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
+ '/linux/releases/29/Everything/armhfp/os/images/pxeboot'
+ '/vmlinuz')
+ kernel_hash = 'e9826d741b4fb04cadba8d4824d1ed3b7fb8b4d4'
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=ttyAMA0')
+ console_pattern = 'VFS: Cannot open root device'
+
+ self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=1)
+
+ def test_arm_cubieboard_initrd(self):
+ """
+ :avocado: tags=arch:arm
+ :avocado: tags=machine:cubieboard
+ """
+ deb_url = ('https://apt.armbian.com/pool/main/l/'
+ 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb')
+ deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315'
+ deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
+ kernel_path = self.extract_from_deb(deb_path,
+ '/boot/vmlinuz-4.20.7-sunxi')
+ dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb'
+ dtb_path = self.extract_from_deb(deb_path, dtb_path)
+ initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
+ '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/'
+ 'arm/rootfs-armv5.cpio.gz')
+ initrd_hash = '2b50f1873e113523967806f4da2afe385462ff9b'
+ initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
+ initrd_path = os.path.join(self.workdir, 'rootfs.cpio')
+ archive.gzip_uncompress(initrd_path_gz, initrd_path)
+
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=ttyS0,115200 '
+ 'usbcore.nousb '
+ 'panic=-1 noreboot')
+ console_pattern = 'Boot successful.'
+ self.run_rr(kernel_path, kernel_command_line, console_pattern, shift=1,
+ args=('-dtb', dtb_path,
+ '-initrd', initrd_path,
+ '-no-reboot'))
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 6/8] tests/acceptance: add record/replay test for ppc64
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2020-06-22 8:59 ` [PULL 5/8] tests/acceptance: add record/replay test for arm Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 7/8] tests/acceptance: add record/replay test for m68k Philippe Mathieu-Daudé
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Wainer dos Santos Moschetta, Pavel Dovgalyuk, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds a test for record/replay of the kernel
image boot for ppc64 platform.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <159073591363.20809.15658672985367330140.stgit@pasha-ThinkPad-X280>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/replay_kernel.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 748c780575..b7acc4bc71 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -156,3 +156,19 @@ def test_arm_cubieboard_initrd(self):
args=('-dtb', dtb_path,
'-initrd', initrd_path,
'-no-reboot'))
+
+ 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)
+
+ kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
+ # icount is not good enough for PPC64 for complete boot yet
+ console_pattern = 'Kernel command line: %s' % kernel_command_line
+ self.run_rr(kernel_path, kernel_command_line, console_pattern)
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 7/8] tests/acceptance: add record/replay test for m68k
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2020-06-22 8:59 ` [PULL 6/8] tests/acceptance: add record/replay test for ppc64 Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-22 8:59 ` [PULL 8/8] tests/acceptance: record/replay tests with advcal images Philippe Mathieu-Daudé
2020-06-23 10:38 ` [PULL 0/8] Acceptance testing patches for 2020-06-22 Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Wainer dos Santos Moschetta, Pavel Dovgalyuk,
Pavel Dovgalyuk, Cleber Rosa, Paolo Bonzini,
Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds a test for record/replay of the kernel
image boot for m68k platform.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <159073592033.20809.1838967871297177313.stgit@pasha-ThinkPad-X280>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/replay_kernel.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index b7acc4bc71..8ef4e499b7 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -172,3 +172,21 @@ def test_ppc64_pseries(self):
# icount is not good enough for PPC64 for complete boot yet
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.run_rr(kernel_path, kernel_command_line, console_pattern)
+
+ def test_m68k_q800(self):
+ """
+ :avocado: tags=arch:m68k
+ :avocado: tags=machine:q800
+ """
+ deb_url = ('https://snapshot.debian.org/archive/debian-ports'
+ '/20191021T083923Z/pool-m68k/main'
+ '/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb')
+ deb_hash = '044954bb9be4160a3ce81f8bc1b5e856b75cccd1'
+ deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
+ kernel_path = self.extract_from_deb(deb_path,
+ '/boot/vmlinux-5.3.0-1-m68k')
+
+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
+ 'console=ttyS0 vga=off')
+ console_pattern = 'No filesystem could mount root'
+ self.run_rr(kernel_path, kernel_command_line, console_pattern)
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 8/8] tests/acceptance: record/replay tests with advcal images
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2020-06-22 8:59 ` [PULL 7/8] tests/acceptance: add record/replay test for m68k Philippe Mathieu-Daudé
@ 2020-06-22 8:59 ` Philippe Mathieu-Daudé
2020-06-23 10:38 ` [PULL 0/8] Acceptance testing patches for 2020-06-22 Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-22 8:59 UTC (permalink / raw)
To: qemu-devel
Cc: Wainer dos Santos Moschetta, Pavel Dovgalyuk, Pavel Dovgalyuk,
Cleber Rosa, Paolo Bonzini, Philippe Mathieu-Daudé
From: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
This patch adds more record/replay tests with kernel images.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Tested-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <159073592589.20809.5156301499042635614.stgit@pasha-ThinkPad-X280>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[PMD: Use os.path.join(), add avocado 'cpu' tags]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/replay_kernel.py | 108 ++++++++++++++++++++++++++++++
1 file changed, 108 insertions(+)
diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py
index 8ef4e499b7..60621417dd 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -190,3 +190,111 @@ def test_m68k_q800(self):
'console=ttyS0 vga=off')
console_pattern = 'No filesystem could mount root'
self.run_rr(kernel_path, kernel_command_line, console_pattern)
+
+ def do_test_advcal_2018(self, file_path, kernel_name, args=None):
+ archive.extract(file_path, self.workdir)
+
+ for entry in os.scandir(self.workdir):
+ if entry.name.startswith('day') and entry.is_dir():
+ kernel_path = os.path.join(entry.path, kernel_name)
+ break
+
+ kernel_command_line = ''
+ console_pattern = 'QEMU advent calendar'
+ self.run_rr(kernel_path, kernel_command_line, console_pattern,
+ args=args)
+
+ def test_arm_vexpressa9(self):
+ """
+ :avocado: tags=arch:arm
+ :avocado: tags=machine:vexpress-a9
+ """
+ tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day16.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ dtb_path = self.workdir + '/day16/vexpress-v2p-ca9.dtb'
+ self.do_test_advcal_2018(file_path, 'winter.zImage',
+ args=('-dtb', dtb_path))
+
+ def test_m68k_mcf5208evb(self):
+ """
+ :avocado: tags=arch:m68k
+ :avocado: tags=machine:mcf5208evb
+ """
+ tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day07.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'sanity-clause.elf')
+
+ def test_microblaze_s3adsp1800(self):
+ """
+ :avocado: tags=arch:microblaze
+ :avocado: tags=machine:petalogix-s3adsp1800
+ """
+ tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day17.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'ballerina.bin')
+
+ def test_ppc64_e500(self):
+ """
+ :avocado: tags=arch:ppc64
+ :avocado: tags=machine:ppce500
+ :avocado: tags=cpu:e5500
+ """
+ tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day19.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'uImage', ('-cpu', 'e5500'))
+
+ def test_ppc_g3beige(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:g3beige
+ """
+ tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day15.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'invaders.elf',
+ args=('-M', 'graphics=off'))
+
+ def test_ppc_mac99(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:mac99
+ """
+ tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day15.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'invaders.elf',
+ args=('-M', 'graphics=off'))
+
+ def test_sparc_ss20(self):
+ """
+ :avocado: tags=arch:sparc
+ :avocado: tags=machine:SS-20
+ """
+ tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day11.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'zImage.elf')
+
+ def test_xtensa_lx60(self):
+ """
+ :avocado: tags=arch:xtensa
+ :avocado: tags=machine:lx60
+ :avocado: tags=cpu:dc233c
+ """
+ tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34'
+ tar_url = ('https://www.qemu-advent-calendar.org'
+ '/2018/download/day02.tar.xz')
+ file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
+ self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf',
+ args=('-cpu', 'dc233c'))
--
2.21.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PULL 0/8] Acceptance testing patches for 2020-06-22
2020-06-22 8:59 [PULL 0/8] Acceptance testing patches for 2020-06-22 Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2020-06-22 8:59 ` [PULL 8/8] tests/acceptance: record/replay tests with advcal images Philippe Mathieu-Daudé
@ 2020-06-23 10:38 ` Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2020-06-23 10:38 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Pavel Dovgalyuk, Paolo Bonzini, QEMU Developers,
Wainer dos Santos Moschetta, Cleber Rosa
On Mon, 22 Jun 2020 at 10:01, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> The following changes since commit 06c4cc3660b366278bdc7bc8b6677032d7b1118c:
>
> qht: Fix threshold rate calculation (2020-06-19 18:29:11 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/philmd/qemu.git tags/acceptance-testing-20200622
>
> for you to fetch changes up to b52d7e216c663ae89c65d656faf3a80b1c05737e:
>
> tests/acceptance: record/replay tests with advcal images (2020-06-21 13:58:=
> 52 +0200)
>
> ----------------------------------------------------------------
> Acceptance tests patches
>
> - List acceptance test reviewers in MAINTAINERS
> - Record/Replay tests from Pavel Dovgalyuk
>
> Travis-CI:
> https://travis-ci.org/github/philmd/qemu/jobs/700787719
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread