| Message ID | 20200215192216.4899-4-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm: Add raspi[0123] acceptance tests | expand |
On 2/15/20 8:22 PM, Philippe Mathieu-Daudé wrote: > $ avocado --show=app,console run -t machine:raspi1 tests/acceptance/ > JOB ID : c49310d4a21444f03789cd2c443d8c54a29ffd0a > JOB LOG : avocado/job-results/job-2020-02-05T23.52-c49310d/job.log > (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi1_uart0: > console: [ 0.000000] Booting Linux on physical CPU 0x0 > console: [ 0.000000] Linux version 4.14.98+ (dom@dom-XPS-13-9370) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 Tue Feb 12 20:11:02 GMT 2019 > console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revision 7 (ARMv7), cr=00c5387d > console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instruction cache > console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi Model B > console: [ 0.000000] earlycon: pl11 at MMIO 0x20201000 (options '') > console: [ 0.000000] bootconsole [pl11] enabled > console: [ 0.000000] Memory policy: Data cache writeback > console: [ 0.000000] cma: Reserved 8 MiB at 0x1b800000 > console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 113680 > console: [ 0.000000] Kernel command line: printk.time=0 earlycon=pl011,0x20201000 console=ttyAMA0 > PASS (12.93 s) > RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 > JOB TIME : 13.18 s > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Luc Michel <luc.michel@greensocs.com> > --- > tests/acceptance/boot_linux_console.py | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index a1b6e70d3f..c8eabae695 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -355,13 +355,16 @@ def do_test_arm_raspi(self, version, uart_model): > """ > serial_kernel_cmdline = { > 'pl011': { > + 1: 'earlycon=pl011,0x20201000 console=ttyAMA0', > 2: 'earlycon=pl011,0x3f201000 console=ttyAMA0', > }, > } > kernel = { > + 1: '/boot/kernel.img', > 2: '/boot/kernel7.img', > } > dtb = { > + 1: '/boot/bcm2708-rpi-b.dtb', > 2: '/boot/bcm2709-rpi-2-b.dtb', > } > deb_url = ('http://archive.raspberrypi.org/debian/' > @@ -382,6 +385,15 @@ def do_test_arm_raspi(self, version, uart_model): > console_pattern = 'Kernel command line: %s' % kernel_command_line > self.wait_for_console_pattern(console_pattern) > > + def test_arm_raspi1_uart0(self): > + """ > + :avocado: tags=arch:arm > + :avocado: tags=machine:raspi1 > + :avocado: tags=cpu:arm1176 > + :avocado: tags=device:pl011 > + """ > + self.do_test_arm_raspi(1, 'pl011') > + > def test_arm_raspi2_uart0(self): > """ > :avocado: tags=arch:arm >
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index a1b6e70d3f..c8eabae695 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -355,13 +355,16 @@ def do_test_arm_raspi(self, version, uart_model): """ serial_kernel_cmdline = { 'pl011': { + 1: 'earlycon=pl011,0x20201000 console=ttyAMA0', 2: 'earlycon=pl011,0x3f201000 console=ttyAMA0', }, } kernel = { + 1: '/boot/kernel.img', 2: '/boot/kernel7.img', } dtb = { + 1: '/boot/bcm2708-rpi-b.dtb', 2: '/boot/bcm2709-rpi-2-b.dtb', } deb_url = ('http://archive.raspberrypi.org/debian/' @@ -382,6 +385,15 @@ def do_test_arm_raspi(self, version, uart_model): console_pattern = 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) + def test_arm_raspi1_uart0(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:raspi1 + :avocado: tags=cpu:arm1176 + :avocado: tags=device:pl011 + """ + self.do_test_arm_raspi(1, 'pl011') + def test_arm_raspi2_uart0(self): """ :avocado: tags=arch:arm
$ avocado --show=app,console run -t machine:raspi1 tests/acceptance/ JOB ID : c49310d4a21444f03789cd2c443d8c54a29ffd0a JOB LOG : avocado/job-results/job-2020-02-05T23.52-c49310d/job.log (1/1) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_raspi1_uart0: console: [ 0.000000] Booting Linux on physical CPU 0x0 console: [ 0.000000] Linux version 4.14.98+ (dom@dom-XPS-13-9370) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611)) #1200 Tue Feb 12 20:11:02 GMT 2019 console: [ 0.000000] CPU: ARMv6-compatible processor [410fb767] revision 7 (ARMv7), cr=00c5387d console: [ 0.000000] CPU: VIPT aliasing data cache, unknown instruction cache console: [ 0.000000] OF: fdt: Machine model: Raspberry Pi Model B console: [ 0.000000] earlycon: pl11 at MMIO 0x20201000 (options '') console: [ 0.000000] bootconsole [pl11] enabled console: [ 0.000000] Memory policy: Data cache writeback console: [ 0.000000] cma: Reserved 8 MiB at 0x1b800000 console: [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 113680 console: [ 0.000000] Kernel command line: printk.time=0 earlycon=pl011,0x20201000 console=ttyAMA0 PASS (12.93 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0 JOB TIME : 13.18 s Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/acceptance/boot_linux_console.py | 12 ++++++++++++ 1 file changed, 12 insertions(+)