From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glgHa-0004Bp-JF for qemu-devel@nongnu.org; Mon, 21 Jan 2019 15:34:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glgHZ-0001En-HH for qemu-devel@nongnu.org; Mon, 21 Jan 2019 15:34:58 -0500 Date: Mon, 21 Jan 2019 18:34:43 -0200 From: Caio Carrara Message-ID: <20190121203442.GQ17671@localhost.localdomain> References: <20190117185628.21862-1-crosa@redhat.com> <20190117185628.21862-19-crosa@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20190117185628.21862-19-crosa@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 18/18] Boot Linux Console Test: add a test for alpha + clipper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cleber Rosa Cc: qemu-devel@nongnu.org, Alex =?iso-8859-1?Q?Benn=E9e?= , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Stefan Markovic , Aleksandar Markovic , Eduardo Habkost , qemu-s390x@nongnu.org, Aurelien Jarno , Cornelia Huck , Fam Zheng , Wainer dos Santos Moschetta , Aleksandar Rikalo , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= On Thu, Jan 17, 2019 at 01:56:28PM -0500, Cleber Rosa wrote: > Similar to the x86_64 + pc test, it boots a Linux kernel on a Malta > board and verify the serial is working. One extra command added to > the QEMU command line is '-vga std', because the kernel used is > known to crash without it. >=20 > If alpha is a target being built, "make check-acceptance" will > automatically include this test by the use of the "arch:alpha" tags. >=20 > Alternatively, this test can be run using: >=20 > $ avocado run -t arch:alpha tests/acceptance > $ avocado run -t machine:clipper tests/acceptance >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 > Signed-off-by: Cleber Rosa Reviewed-by: Caio Carrara > --- > .travis.yml | 2 +- > scripts/qemu.py | 1 - > tests/acceptance/boot_linux_console.py | 22 ++++++++++++++++++++++ > 3 files changed, 23 insertions(+), 2 deletions(-) >=20 > diff --git a/.travis.yml b/.travis.yml > index 0d5a4b104b..73a113af87 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= -softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-= softmmu,s390x-softmmu" > + - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64= -softmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-= softmmu,s390x-softmmu,alpha-softmmu" > - TEST_CMD=3D"make check-acceptance" > addons: > apt: > diff --git a/scripts/qemu.py b/scripts/qemu.py > index 1531e28fc1..a704da418a 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -34,7 +34,6 @@ def kvm_available(target_arch=3DNone): > =20 > #: Maps machine types to the preferred console device types > CONSOLE_DEV_TYPES =3D { > - r'^clipper$': 'isa-serial', > r'^(pc.*|q35.*|isapc)$': 'isa-serial', > r'^(40p|powernv|prep)$': 'isa-serial', > r'^s390-ccw-virtio.*': 'sclpconsole', > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/= boot_linux_console.py > index c4d5477d45..a8028a39d4 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -197,3 +197,25 @@ class BootLinuxConsole(Test): > self.vm.launch() > console_pattern =3D 'Kernel command line: %s' % kernel_command= _line > self.wait_for_console_pattern(console_pattern) > + > + def test_alpha_clipper(self): > + """ > + :avocado: tags=3Darch:alpha > + :avocado: tags=3Dmachine:clipper > + """ > + kernel_url =3D ('http://archive.debian.org/debian/dists/lenny/= main/' > + 'installer-alpha/current/images/cdrom/vmlinuz') > + kernel_hash =3D '3a943149335529e2ed3e74d0d787b85fb5671ba3' > + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkern= el_hash) > + > + uncompressed_kernel =3D archive.uncompress(kernel_path, self.w= orkdir) > + > + self.vm.set_machine('clipper') > + self.vm.set_console() > + kernel_command_line =3D 'console=3DttyS0 printk.time=3D0' > + self.vm.add_args('-vga', 'std', > + '-kernel', uncompressed_kernel, > + '-append', kernel_command_line) > + self.vm.launch() > + console_pattern =3D 'Kernel command line: %s' % kernel_command= _line > + self.wait_for_console_pattern(console_pattern) > --=20 > 2.20.1 >=20 --=20 Caio Carrara Software Engineer, Virt Team - Red Hat ccarrara@redhat.com