From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:42693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkCqd-00057C-SD for qemu-devel@nongnu.org; Thu, 17 Jan 2019 13:57:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkCqc-0005r6-6G for qemu-devel@nongnu.org; Thu, 17 Jan 2019 13:57:03 -0500 From: Cleber Rosa Date: Thu, 17 Jan 2019 13:56:22 -0500 Message-Id: <20190117185628.21862-13-crosa@redhat.com> In-Reply-To: <20190117185628.21862-1-crosa@redhat.com> References: <20190117185628.21862-1-crosa@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 12/18] Boot Linux Console Test: add a test for mips + malta List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Markovic , Aleksandar Markovic , Eduardo Habkost , Caio Carrara , qemu-s390x@nongnu.org, Aurelien Jarno , Cornelia Huck , Cleber Rosa , Fam Zheng , Wainer dos Santos Moschetta , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= From: Philippe Mathieu-Daud=C3=A9 Similar to the x86_64 + pc test, it boots a Linux kernel on a Malta board and verify the serial is working. Also, it relies on the serial device set by the machine itself. If mips is a target being built, "make check-acceptance" will automatically include this test by the use of the "arch:mips" tags. Alternatively, this test can be run using: $ avocado run -t arch:mips tests/acceptance $ avocado run -t machine:malta tests/acceptance $ avocado run -t endian:big tests/acceptance Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Cleber Rosa --- .travis.yml | 2 +- scripts/qemu.py | 1 - tests/acceptance/boot_linux_console.py | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 844d514afa..49f9016e6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -187,7 +187,7 @@ matrix: =20 # Acceptance (Functional) tests - env: - - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64-s= oftmmu" + - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64-s= oftmmu,mips-softmmu" - TEST_CMD=3D"make check-acceptance" addons: apt: diff --git a/scripts/qemu.py b/scripts/qemu.py index 88e1608b42..ef84b0f843 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -35,7 +35,6 @@ def kvm_available(target_arch=3DNone): #: Maps machine types to the preferred console device types CONSOLE_DEV_TYPES =3D { r'^clipper$': 'isa-serial', - r'^malta': 'isa-serial', r'^(pc.*|q35.*|isapc)$': 'isa-serial', r'^(40p|powernv|prep)$': 'isa-serial', r'^pseries.*': 'spapr-vty', diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/bo= ot_linux_console.py index 278bb2be3d..0678ec91d2 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -60,3 +60,23 @@ class BootLinuxConsole(Test): self.vm.launch() console_pattern =3D 'Kernel command line: %s' % kernel_command_l= ine self.wait_for_console_pattern(console_pattern) + + def test_mips_malta(self): + """ + :avocado: tags=3Darch:mips + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dendian:big + """ + kernel_url =3D ('http://people.debian.org/~aurel32/qemu/mips/' + 'vmlinux-3.2.0-4-4kc-malta') + kernel_hash =3D '592e384a4edc16dade52a6cd5c785c637bcbc9ad' + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel= _hash) + + self.vm.set_machine('malta') + self.vm.set_console() + kernel_command_line =3D 'console=3DttyS0 printk.time=3D0' + self.vm.add_args('-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.launch() + console_pattern =3D 'Kernel command line: %s' % kernel_command_l= ine + self.wait_for_console_pattern(console_pattern) --=20 2.20.1