| Message ID | 20200215192216.4899-2-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: > Python dictionary are not that expensive. Use a key makes the > code easier to review. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Luc Michel <luc.michel@greensocs.com> > --- > tests/acceptance/boot_linux_console.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index 34d37eba3b..8cfc758d42 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -347,14 +347,14 @@ def test_arm_emcraft_sf2(self): > self.vm.launch() > self.wait_for_console_pattern('init started: BusyBox') > > - def do_test_arm_raspi2(self, uart_id): > + def do_test_arm_raspi2(self, uart_model): > """ > The kernel can be rebuilt using the kernel source referenced > and following the instructions on the on: > https://www.raspberrypi.org/documentation/linux/kernel/building.md > """ > serial_kernel_cmdline = { > - 0: 'earlycon=pl011,0x3f201000 console=ttyAMA0', > + 'pl011': 'earlycon=pl011,0x3f201000 console=ttyAMA0', > } > deb_url = ('http://archive.raspberrypi.org/debian/' > 'pool/main/r/raspberrypi-firmware/' > @@ -366,7 +366,7 @@ def do_test_arm_raspi2(self, uart_id): > > self.vm.set_console() > kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + > - serial_kernel_cmdline[uart_id]) > + serial_kernel_cmdline[uart_model]) > self.vm.add_args('-kernel', kernel_path, > '-dtb', dtb_path, > '-append', kernel_command_line) > @@ -380,7 +380,7 @@ def test_arm_raspi2_uart0(self): > :avocado: tags=machine:raspi2 > :avocado: tags=device:pl011 > """ > - self.do_test_arm_raspi2(0) > + self.do_test_arm_raspi2('pl011') > > def test_arm_exynos4210_initrd(self): > """ >
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 34d37eba3b..8cfc758d42 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -347,14 +347,14 @@ def test_arm_emcraft_sf2(self): self.vm.launch() self.wait_for_console_pattern('init started: BusyBox') - def do_test_arm_raspi2(self, uart_id): + def do_test_arm_raspi2(self, uart_model): """ The kernel can be rebuilt using the kernel source referenced and following the instructions on the on: https://www.raspberrypi.org/documentation/linux/kernel/building.md """ serial_kernel_cmdline = { - 0: 'earlycon=pl011,0x3f201000 console=ttyAMA0', + 'pl011': 'earlycon=pl011,0x3f201000 console=ttyAMA0', } deb_url = ('http://archive.raspberrypi.org/debian/' 'pool/main/r/raspberrypi-firmware/' @@ -366,7 +366,7 @@ def do_test_arm_raspi2(self, uart_id): self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - serial_kernel_cmdline[uart_id]) + serial_kernel_cmdline[uart_model]) self.vm.add_args('-kernel', kernel_path, '-dtb', dtb_path, '-append', kernel_command_line) @@ -380,7 +380,7 @@ def test_arm_raspi2_uart0(self): :avocado: tags=machine:raspi2 :avocado: tags=device:pl011 """ - self.do_test_arm_raspi2(0) + self.do_test_arm_raspi2('pl011') def test_arm_exynos4210_initrd(self): """
Python dictionary are not that expensive. Use a key makes the code easier to review. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- tests/acceptance/boot_linux_console.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)