From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:43749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkCrK-0005kD-0R for qemu-devel@nongnu.org; Thu, 17 Jan 2019 13:57:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkCrD-0006xG-N4 for qemu-devel@nongnu.org; Thu, 17 Jan 2019 13:57:45 -0500 From: Cleber Rosa Date: Thu, 17 Jan 2019 13:56:27 -0500 Message-Id: <20190117185628.21862-18-crosa@redhat.com> In-Reply-To: <20190117185628.21862-1-crosa@redhat.com> References: <20190117185628.21862-1-crosa@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 17/18] Boot Linux Console Test: add a test for s390x + s390-ccw-virtio 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 Just like the previous tests, boots a Linux kernel on a s390x target using the s390-ccw-virtio machine. Because it's not possible to have multiple VT220 consoles, '-nodefaults' is used, so that the one set with set_console() works correctly. Signed-off-by: Cleber Rosa --- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea7c9828ac..0d5a4b104b 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,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-so= ftmmu" + - CONFIG=3D"--python=3D/usr/bin/python3 --target-list=3Dx86_64-s= oftmmu,mips-softmmu,mips64el-softmmu,ppc64-softmmu,aarch64-softmmu,arm-so= ftmmu,s390x-softmmu" - TEST_CMD=3D"make check-acceptance" addons: apt: diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/bo= ot_linux_console.py index 00aee3114e..c4d5477d45 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -177,3 +177,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_s390x_s390_ccw_virtio(self): + """ + :avocado: tags=3Darch:s390x + :avocado: tags=3Dmachine:s390_ccw_virtio + """ + kernel_url =3D ('http://mirrors.rit.edu/fedora/fedora-secondary/= releases' + '/29/Server/s390x/os/images/kernel.img') + kernel_hash =3D 'e8e8439103ef8053418ef062644ffd46a7919313' + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel= _hash) + + self.vm.set_machine('s390-ccw-virtio') + self.vm.set_console() + kernel_command_line =3D 'console=3Dsclp0' + self.vm.add_args('-nodefaults', + '-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