Commit 79182494 authored by Cleber Rosa's avatar Cleber Rosa Committed by Eduardo Habkost
Browse files

tests/boot_linux_console: add a test for s390x + s390-ccw-virtio 



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: default avatarCleber Rosa <crosa@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarCaio Carrara <ccarrara@redhat.com>
Message-Id: <20190312171824.5134-20-crosa@redhat.com>
[ehabkost: Updated kernel URL to point to fedoraproject.org]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 1a30892e

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ matrix: 


    # Acceptance (Functional) tests

    - env:

        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu"

        - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu"

        - TEST_CMD="make check-acceptance"

      addons:

        apt:

tests/acceptance/boot_linux_console.py

+20 −0
Original line number Diff line number Diff line
@@ -175,3 +175,23 @@ class BootLinuxConsole(Test): 
        self.vm.launch()

        console_pattern = 'Kernel command line: %s' % kernel_command_line

        self.wait_for_console_pattern(console_pattern)



    def test_s390x_s390_ccw_virtio(self):

        """

        :avocado: tags=arch:s390x

        :avocado: tags=machine:s390_ccw_virtio

        """

        kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/'

                      'releases/29/Everything/s390x/os/images/kernel.img')

        kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313'

        kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)



        self.vm.set_machine('s390-ccw-virtio')

        self.vm.set_console()

        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=sclp0'

        self.vm.add_args('-nodefaults',

                         '-kernel', kernel_path,

                         '-append', kernel_command_line)

        self.vm.launch()

        console_pattern = 'Kernel command line: %s' % kernel_command_line

        self.wait_for_console_pattern(console_pattern)