[v27,8/8] target/avr: Add tests
diff mbox series

Message ID 20190719082647.18113-9-mrolnik@gmail.com
State New
Headers show
Series
  • QEMU AVR 8 bit cores
Related show

Commit Message

Michael Rolnik July 19, 2019, 8:26 a.m. UTC
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

2. Boot serial test
    Prinit out 'T' through serial port

Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
---
 tests/Makefile.include           |  2 ++
 tests/acceptance/machine_avr6.py | 36 ++++++++++++++++++++++++++++++++
 tests/boot-serial-test.c         | 12 +++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 tests/acceptance/machine_avr6.py

Comments

Philippe Mathieu-Daudé July 19, 2019, 1:26 p.m. UTC | #1
On 7/19/19 10:26 AM, Michael Rolnik 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

Note, that test also demonstrates the timer and irq are working :)

Enabling DB_PRINT:

avr_timer16_interrupt: CTC OCRA overflow
avr_timer16_interrupt: interrupt, cnt = 253
avr_timer16_interrupt: CTC OCRA overflow
avr_timer16_interrupt: interrupt, cnt = 269
avr_timer16_interrupt: CTC OCRA overflow
avr_timer16_interrupt: interrupt, cnt = 269

(There is also GPIO accesses but you don't implement them yet).

> 
> 2. Boot serial test
>     Prinit out 'T' through serial port

Excellent!

> 
> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
> ---
>  tests/Makefile.include           |  2 ++
>  tests/acceptance/machine_avr6.py | 36 ++++++++++++++++++++++++++++++++
>  tests/boot-serial-test.c         | 12 +++++++++++
>  3 files changed, 50 insertions(+)
>  create mode 100644 tests/acceptance/machine_avr6.py
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index fd7fdb8658..8a186dcc23 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -201,6 +201,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 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX'
> +        """
> +        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 24852d4c7d..73d273b73f 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -16,6 +16,17 @@
>  #include "qemu/osdep.h"
>  #include "libqtest.h"
>  
> +static const uint8_t bios_avr[] = {
> +    0x89, 0xe1,             /* ldi r24, 0x19   */
> +    0x80, 0x93, 0xc5, 0x00, /* sts 0x00C5, r24 ; set baud rate to 38400 */

FWIW we can remove the previous two lines, we don't care about the
baudrate in this test.

> +    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 */
> @@ -92,6 +103,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" },
> 

Testing shows:

  TEST    check-qtest-avr: tests/boot-serial-test
qemu-system-avr: Unable to load /tmp/qtest-boot-serial-cOndewD as ELF,
trying again as raw binary

I wonder if this might fail Peter's testing, so Cc'ing Thomas.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Regards,

Phil.
Michael Rolnik July 19, 2019, 3:05 p.m. UTC | #2
thanks.

On Fri, Jul 19, 2019 at 4:26 PM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:

> On 7/19/19 10:26 AM, Michael Rolnik 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
>
> Note, that test also demonstrates the timer and irq are working :)
>
> Enabling DB_PRINT:
>
> avr_timer16_interrupt: CTC OCRA overflow
> avr_timer16_interrupt: interrupt, cnt = 253
> avr_timer16_interrupt: CTC OCRA overflow
> avr_timer16_interrupt: interrupt, cnt = 269
> avr_timer16_interrupt: CTC OCRA overflow
> avr_timer16_interrupt: interrupt, cnt = 269
>
> (There is also GPIO accesses but you don't implement them yet).
>
> >
> > 2. Boot serial test
> >     Prinit out 'T' through serial port
>
> Excellent!
>
> >
> > Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
> > ---
> >  tests/Makefile.include           |  2 ++
> >  tests/acceptance/machine_avr6.py | 36 ++++++++++++++++++++++++++++++++
> >  tests/boot-serial-test.c         | 12 +++++++++++
> >  3 files changed, 50 insertions(+)
> >  create mode 100644 tests/acceptance/machine_avr6.py
> >
> > diff --git a/tests/Makefile.include b/tests/Makefile.include
> > index fd7fdb8658..8a186dcc23 100644
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
> > @@ -201,6 +201,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
> 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX'
> > +        """
> > +        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 24852d4c7d..73d273b73f 100644
> > --- a/tests/boot-serial-test.c
> > +++ b/tests/boot-serial-test.c
> > @@ -16,6 +16,17 @@
> >  #include "qemu/osdep.h"
> >  #include "libqtest.h"
> >
> > +static const uint8_t bios_avr[] = {
> > +    0x89, 0xe1,             /* ldi r24, 0x19   */
> > +    0x80, 0x93, 0xc5, 0x00, /* sts 0x00C5, r24 ; set baud rate to 38400
> */
>
> FWIW we can remove the previous two lines, we don't care about the
> baudrate in this test.
>
> > +    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 */
> > @@ -92,6 +103,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" },
> >
>
> Testing shows:
>
>   TEST    check-qtest-avr: tests/boot-serial-test
> qemu-system-avr: Unable to load /tmp/qtest-boot-serial-cOndewD as ELF,
> trying again as raw binary
>
> I wonder if this might fail Peter's testing, so Cc'ing Thomas.
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Regards,
>
> Phil.
>
Thomas Huth July 21, 2019, 7:13 a.m. UTC | #3
On 19/07/2019 15.26, Philippe Mathieu-Daudé wrote:
> On 7/19/19 10:26 AM, Michael Rolnik wrote:
[...]
>> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
>> index 24852d4c7d..73d273b73f 100644
>> --- a/tests/boot-serial-test.c
>> +++ b/tests/boot-serial-test.c
>> @@ -16,6 +16,17 @@
>>  #include "qemu/osdep.h"
>>  #include "libqtest.h"
>>  
>> +static const uint8_t bios_avr[] = {
>> +    0x89, 0xe1,             /* ldi r24, 0x19   */
>> +    0x80, 0x93, 0xc5, 0x00, /* sts 0x00C5, r24 ; set baud rate to 38400 */
> 
> FWIW we can remove the previous two lines, we don't care about the
> baudrate in this test.
> 
>> +    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 */
>> @@ -92,6 +103,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" },
>>
> 
> Testing shows:
> 
>   TEST    check-qtest-avr: tests/boot-serial-test
> qemu-system-avr: Unable to load /tmp/qtest-boot-serial-cOndewD as ELF,
> trying again as raw binary
> 
> I wonder if this might fail Peter's testing, so Cc'ing Thomas.

Such messages are quite a bit anoying during "make check", indeed. Could
you please fence the message with qtest_enabled() ?

 Thanks,
   Thomas
Michael Rolnik July 22, 2019, 9:16 a.m. UTC | #4
Hi Thomas.
where should I specify this command?

On Sun, Jul 21, 2019 at 10:13 AM Thomas Huth <thuth@redhat.com> wrote:

> On 19/07/2019 15.26, Philippe Mathieu-Daudé wrote:
> > On 7/19/19 10:26 AM, Michael Rolnik wrote:
> [...]
> >> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> >> index 24852d4c7d..73d273b73f 100644
> >> --- a/tests/boot-serial-test.c
> >> +++ b/tests/boot-serial-test.c
> >> @@ -16,6 +16,17 @@
> >>  #include "qemu/osdep.h"
> >>  #include "libqtest.h"
> >>
> >> +static const uint8_t bios_avr[] = {
> >> +    0x89, 0xe1,             /* ldi r24, 0x19   */
> >> +    0x80, 0x93, 0xc5, 0x00, /* sts 0x00C5, r24 ; set baud rate to
> 38400 */
> >
> > FWIW we can remove the previous two lines, we don't care about the
> > baudrate in this test.
> >
> >> +    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 */
> >> @@ -92,6 +103,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" },
> >>
> >
> > Testing shows:
> >
> >   TEST    check-qtest-avr: tests/boot-serial-test
> > qemu-system-avr: Unable to load /tmp/qtest-boot-serial-cOndewD as ELF,
> > trying again as raw binary
> >
> > I wonder if this might fail Peter's testing, so Cc'ing Thomas.
>
> Such messages are quite a bit anoying during "make check", indeed. Could
> you please fence the message with qtest_enabled() ?
>
>  Thanks,
>    Thomas
>
Thomas Huth July 22, 2019, 9:41 a.m. UTC | #5
Hi Michael,

On 22/07/2019 11.16, Michael Rolnik wrote:
> Hi Thomas.
> where should I specify this command?

In patch 6/8, you introduced the error message:

        if (bytes_loaded < 0) {
            error_report(
                "Unable to load %s as ELF, trying again as raw binary",
                firmware);
            bytes_loaded = load_image_targphys(
                filename, OFFSET_CODE, SIZE_FLASH);
        }

You should fence it there like this:

        if (bytes_loaded < 0) {
            if (!qtest_enabled()) {
                error_report(
                    "Unable to load %s as ELF, trying again as raw binary",
                    firmware);
            }
            bytes_loaded = load_image_targphys(
                filename, OFFSET_CODE, SIZE_FLASH);
        }

Also, is this really an error, or should this rather be a warn_report()
instead? Or maybe you don't even need this message at all, in case raw
binaries are a valid alternative?

  Thomas


> On Sun, Jul 21, 2019 at 10:13 AM Thomas Huth <thuth@redhat.com
> <mailto:thuth@redhat.com>> wrote:
> 
>     On 19/07/2019 15.26, Philippe Mathieu-Daudé wrote:
>     > On 7/19/19 10:26 AM, Michael Rolnik wrote:
[...]
>     > Testing shows:
>     >
>     >   TEST    check-qtest-avr: tests/boot-serial-test
>     > qemu-system-avr: Unable to load /tmp/qtest-boot-serial-cOndewD as ELF,
>     > trying again as raw binary
>     >
>     > I wonder if this might fail Peter's testing, so Cc'ing Thomas.
> 
>     Such messages are quite a bit anoying during "make check", indeed. Could
>     you please fence the message with qtest_enabled() ?
> 
>      Thanks,
>        Thomas
> 
> 
> 
> -- 
> Best Regards,
> Michael Rolnik
Michael Rolnik July 22, 2019, 12:33 p.m. UTC | #6
I changed it to info_report.
raw binaries are totally fine, however if a user supplies a damaged elf he
will never know if no warning/info is reported.

On Mon, Jul 22, 2019 at 12:41 PM Thomas Huth <thuth@redhat.com> wrote:

>  Hi Michael,
>
> On 22/07/2019 11.16, Michael Rolnik wrote:
> > Hi Thomas.
> > where should I specify this command?
>
> In patch 6/8, you introduced the error message:
>
>         if (bytes_loaded < 0) {
>             error_report(
>                 "Unable to load %s as ELF, trying again as raw binary",
>                 firmware);
>             bytes_loaded = load_image_targphys(
>                 filename, OFFSET_CODE, SIZE_FLASH);
>         }
>
> You should fence it there like this:
>
>         if (bytes_loaded < 0) {
>             if (!qtest_enabled()) {
>                 error_report(
>                     "Unable to load %s as ELF, trying again as raw binary",
>                     firmware);
>             }
>             bytes_loaded = load_image_targphys(
>                 filename, OFFSET_CODE, SIZE_FLASH);
>         }
>
> Also, is this really an error, or should this rather be a warn_report()
> instead? Or maybe you don't even need this message at all, in case raw
> binaries are a valid alternative?
>
>   Thomas
>
>
> > On Sun, Jul 21, 2019 at 10:13 AM Thomas Huth <thuth@redhat.com
> > <mailto:thuth@redhat.com>> wrote:
> >
> >     On 19/07/2019 15.26, Philippe Mathieu-Daudé wrote:
> >     > On 7/19/19 10:26 AM, Michael Rolnik wrote:
> [...]
> >     > Testing shows:
> >     >
> >     >   TEST    check-qtest-avr: tests/boot-serial-test
> >     > qemu-system-avr: Unable to load /tmp/qtest-boot-serial-cOndewD as
> ELF,
> >     > trying again as raw binary
> >     >
> >     > I wonder if this might fail Peter's testing, so Cc'ing Thomas.
> >
> >     Such messages are quite a bit anoying during "make check", indeed.
> Could
> >     you please fence the message with qtest_enabled() ?
> >
> >      Thanks,
> >        Thomas
> >
> >
> >
> > --
> > Best Regards,
> > Michael Rolnik
>
>
Peter Maydell July 22, 2019, 12:40 p.m. UTC | #7
On Mon, 22 Jul 2019 at 13:33, Michael Rolnik <mrolnik@gmail.com> wrote:
> I changed it to info_report.
> raw binaries are totally fine, however if a user supplies a damaged elf he
> will never know if no warning/info is reported.

I find a good rule of thumb for architecture specific/board specific
code is that if other boards/architectures don't do a particular thing,
it's usually better to be consistent with the rest of QEMU, rather
than introducing an innovation.

"Try to load as an ELF file; if that didn't work fall back
to loading as a raw image" is what other parts of QEMU do,
and they don't complain about doing it. Otherwise, every
user of raw images gets a spurious complaint that their
raw image isn't an ELF file...

thanks
-- PMM
Michael Rolnik July 22, 2019, 1:45 p.m. UTC | #8
got it.

On Mon, Jul 22, 2019 at 3:40 PM Peter Maydell <peter.maydell@linaro.org>
wrote:

> On Mon, 22 Jul 2019 at 13:33, Michael Rolnik <mrolnik@gmail.com> wrote:
> > I changed it to info_report.
> > raw binaries are totally fine, however if a user supplies a damaged elf
> he
> > will never know if no warning/info is reported.
>
> I find a good rule of thumb for architecture specific/board specific
> code is that if other boards/architectures don't do a particular thing,
> it's usually better to be consistent with the rest of QEMU, rather
> than introducing an innovation.
>
> "Try to load as an ELF file; if that didn't work fall back
> to loading as a raw image" is what other parts of QEMU do,
> and they don't complain about doing it. Otherwise, every
> user of raw images gets a spurious complaint that their
> raw image isn't an ELF file...
>
> thanks
> -- PMM
>

Patch
diff mbox series

diff --git a/tests/Makefile.include b/tests/Makefile.include
index fd7fdb8658..8a186dcc23 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -201,6 +201,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 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX'
+        """
+        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 24852d4c7d..73d273b73f 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -16,6 +16,17 @@ 
 #include "qemu/osdep.h"
 #include "libqtest.h"
 
+static const uint8_t bios_avr[] = {
+    0x89, 0xe1,             /* ldi r24, 0x19   */
+    0x80, 0x93, 0xc5, 0x00, /* sts 0x00C5, r24 ; set baud rate to 38400 */
+    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 */
@@ -92,6 +103,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" },