[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] tests/boot_linux_console: add a test for riscv6
From: |
Cleber Rosa |
Subject: |
Re: [Qemu-devel] [PATCH] tests/boot_linux_console: add a test for riscv64 + virt |
Date: |
Wed, 10 Jul 2019 16:23:41 -0400 |
User-agent: |
Mutt/1.12.0 (2019-05-25) |
On Wed, Jul 10, 2019 at 10:50:23AM -0700, Chih-Min Chao wrote:
> Similar to the mips + malta test, it boots a Linux kernel on a virt
> board and verify the serial is working. Also, it relies on the serial
> device set by the machine itself.
>
> If riscv64 is a target being built, "make check-acceptance" will
> automatically include this test by the use of the "arch:riscv64" tags.
>
> Alternatively, this test can be run using:
>
> $ avocado run -t arch:riscv64 tests/acceptance
>
> Signed-off-by: Chih-Min Chao <address@hidden>
> ---
> tests/acceptance/boot_linux_console.py | 40
> ++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
>
> diff --git a/tests/acceptance/boot_linux_console.py
> b/tests/acceptance/boot_linux_console.py
> index 3215950..bbc6b06 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -354,3 +354,43 @@ class BootLinuxConsole(Test):
> self.vm.launch()
> console_pattern = 'Kernel command line: %s' % kernel_command_line
> self.wait_for_console_pattern(console_pattern)
> +
> + def test_riscv64_virt(self):
> + """
> + :avocado: tags=arch:riscv64
> + :avocado: tags=machine:virt
> + """
> +
> + kernel_url = ('https://github.com/chihminchao/test-binary/raw/'
> +
> '0b7787305d9e40815c05a805266cc74ff356239e/qemu/riscv64/'
> + 'bbl_w_kernel.gz')
> + kernel_hash = 'c7f6cc7967975ad42dc61ee0535db01c9cbd0968'
> + kernel_path_gz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
> + kernel_path = self.workdir + "bbl_w_kernel"
> +
> + with gzip.open(kernel_path_gz, 'rb') as f_in:
> + with open(kernel_path, 'wb') as f_out:
> + shutil.copyfileobj(f_in, f_out)
There are currently two patterns for extracting a gzipped file
in this test. So, this is not a must, but maybe you'd prefer:
---
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index bbc6b0683f..9f819e20e1 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -365,12 +365,8 @@ class BootLinuxConsole(Test):
'0b7787305d9e40815c05a805266cc74ff356239e/qemu/riscv64/'
'bbl_w_kernel.gz')
kernel_hash = 'c7f6cc7967975ad42dc61ee0535db01c9cbd0968'
- kernel_path_gz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
- kernel_path = self.workdir + "bbl_w_kernel"
-
- with gzip.open(kernel_path_gz, 'rb') as f_in:
- with open(kernel_path, 'wb') as f_out:
- shutil.copyfileobj(f_in, f_out)
+ kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+ uncompressed_kernel = archive.uncompress(kernel_path, self.workdir)
initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
'8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/'
@@ -382,7 +378,7 @@ class BootLinuxConsole(Test):
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
+ 'console=ttyS0 noreboot')
- self.vm.add_args('-kernel', kernel_path,
+ self.vm.add_args('-kernel', uncompressed_kernel,
'-initrd', initrd_path,
'-append', kernel_command_line)
self.vm.launch()
---
> +
> + initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
> + '8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/'
> + 'riscv64/rootfs.cpio.gz')
> + initrd_hash = 'f4867d263754961b6f626cdcdc0cb334c47e3b49'
> + initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
> +
> + self.vm.set_machine('virt')
> + self.vm.set_console()
> + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
> + + 'console=ttyS0 noreboot')
> + self.vm.add_args('-kernel', kernel_path,
> + '-initrd', initrd_path,
> + '-append', kernel_command_line)
> + self.vm.launch()
> + self.wait_for_console_pattern('Boot successful.')
> +
> + self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo',
> + 'isa')
> + self.exec_command_and_wait_for_pattern('uname -a',
> + 'sifive')
> + self.exec_command_and_wait_for_pattern('reboot',
> + 'reboot: Restarting system')
> --
> 2.7.4
>
>
It'd be nice to also add riscv64 to the target list in .travis.yaml
"acceptance tests" job.
Regards and many thanks for this contribution!
- Cleber.