Re: [Qemu-riscv] [Qemu-devel] [PATCH] tests/boot_linux_console: add a test for riscv64 + virt

[Philippe Mathieu-Daudé]

On 7/11/19 4:43 PM, Alistair Francis wrote:
> On Thu, Jul 11, 2019 at 6:56 AM Philippe Mathieu-Daudé
> <address@hidden> wrote:
>>
>> Hi Chih-Min,
>>
>> On 7/10/19 7:50 PM, 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.
>>
>> Good idea!
>>
>>>
>>> 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')
>>
>> I recommend you to extract fw_jump.elf from [1] and
>> vmlinux-4.19.0-5-riscv64 from [2] with the extract_from_deb() helper.
>>
>> [1] https://packages.debian.org/sid/all/opensbi
>> [2] https://packages.debian.org/sid/linux-image-4.19.0-5-riscv64
> 
> This will works as well if you don't want to bother building the
> images yourself. Ideally we could use a newer kernel then 4.19 but for
> an acceptance test it probably doesn't matter much.

This one is available in 'experimental', in case you want to test it
too, but I'd rather use some stable channel for testing:

https://packages.debian.org/experimental/linux-image-5.0.0-trunk-riscv64

> This way Debain has done all the licence work for you as well :)

And all the building work ;)

> 
> Alistair
> 
>>
>>> +        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)
>>> +
>>> +        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)
>>
>> You might want to use '-no-reboot' here too.
>>
>>> +        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')
>>
>> Regards,
>>
>> Phil.
>>