On Tuesday, October 29, 2019, Michael Rolnik <mrolnik@gmail.com> wrote:
> 1. Avocado test
> The test is based on
> https://github.com/seharris/qemu-avr-tests/tree/master/free-rtos/Demo
> demo which. If working correctly, prints 'ABCDEFGHIJKLMNOPQRSTUVWX'
> out.
> it also demostrates that timer and IRQ are working
>
> 2. Boot serial test
> Print out 'T' through serial port
>
> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Acked-by: Thomas Huth <thuth@redhat.com>
> ---
Acked-by: Aleksandar Markovic <amarkovic@wavecomp.com>
But, please, Michael, divide this patch into two in the next version:
- target/avr: Add boot serial test
- target/avr: Add Avocado acceptance test
with, of course, adjusted corresponding commit messages. You can transfer
all "Reviewed-by:"s, "Tested-by:"s and "Acked-by:"s (includong mine) to
both new patches.
Yours, Aleksandar
> tests/Makefile.include | 2 ++
> tests/acceptance/machine_avr6.py | 36 ++++++++++++++++++++++++++++++++
> tests/boot-serial-test.c | 10 +++++++++
> 3 files changed, 48 insertions(+)
> create mode 100644 tests/acceptance/machine_avr6.py
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 7f487f65e7..3c077f6ca4 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -206,6 +206,8 @@ check-qtest-i386-y += tests/test-x86-cpuid-compat$(
> EXESUF)
> check-qtest-i386-y += tests/numa-test$(EXESUF)
> check-qtest-x86_64-y += $(check-qtest-i386-y)
>
> +check-qtest-avr-y += tests/boot-serial-test$(EXESUF)
> +
> check-qtest-alpha-y += tests/boot-serial-test$(EXESUF)
> check-qtest-alpha-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
>
> diff --git a/tests/acceptance/machine_avr6.py b/tests/acceptance/machine_
> avr6.py
> new file mode 100644
> index 0000000000..0601080b01
> --- /dev/null
> +++ b/tests/acceptance/machine_avr6.py
> @@ -0,0 +1,36 @@
> +import logging
> +import time
> +import distutils.spawn
> +
> +from avocado import skipUnless
> +from avocado_qemu import Test
> +from avocado.utils import process
> +
> +class AVR6Machine(Test):
> + timeout = 5
> +
> + def test_freertos(self):
> + """
> + :avocado: tags=arch:avr
> + :avocado: tags=machine:sample
> + """
> + """
> + https://github.com/seharris/qemu-avr-tests/raw/master/
> free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf
> + constantly prints out 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEF
> GHIJKLMNOPQRSTUVWX'
> + """
> + rom_url = 'https://github.com/seharris/qemu-avr-tests'
> + rom_url += '/raw/master/free-rtos/Demo/
> AVR_ATMega2560_GCC/demo.elf'
> + rom_hash = '7eb521f511ca8f2622e0a3c5e8dd686efbb911d4'
> + rom_path = self.fetch_asset(rom_url, asset_hash=rom_hash)
> +
> + self.vm.set_machine('sample')
> + self.vm.add_args('-bios', rom_path)
> + self.vm.add_args('-nographic')
> + self.vm.launch()
> +
> + time.sleep(2)
> + self.vm.shutdown()
> +
> + match = 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX'
> +
> + self.assertIn(match, self.vm.get_log())
> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> index d3a54a0ba5..1121ed0db2 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -16,6 +16,15 @@
> #include "qemu/osdep.h"
> #include "libqtest.h"
>
> +static const uint8_t bios_avr[] = {
> + 0x88, 0xe0, /* ldi r24, 0x08 */
> + 0x80, 0x93, 0xc1, 0x00, /* sts 0x00C1, r24 ; Enable tx */
> + 0x86, 0xe0, /* ldi r24, 0x06 */
> + 0x80, 0x93, 0xc2, 0x00, /* sts 0x00C2, r24 ; Set the data bits to 8 */
> + 0x84, 0xe5, /* ldi r24, 0x54 */
> + 0x80, 0x93, 0xc6, 0x00, /* sts 0x00C6, r24 ; Output 'T' */
> +};
> +
> static const uint8_t kernel_mcf5208[] = {
> 0x41, 0xf9, 0xfc, 0x06, 0x00, 0x00, /* lea 0xfc060000,%a0 */
> 0x10, 0x3c, 0x00, 0x54, /* move.b #'T',%d0 */
> @@ -103,6 +112,7 @@ typedef struct testdef {
>
> static testdef_t tests[] = {
> { "alpha", "clipper", "", "PCI:" },
> + { "avr", "sample", "", "T", sizeof(bios_avr), NULL, bios_avr },
> { "ppc", "ppce500", "", "U-Boot" },
> { "ppc", "40p", "-vga none -boot d", "Trying cd:," },
> { "ppc", "g3beige", "", "PowerPC,750" },
> --
> 2.17.2 (Apple Git-113)
>
>