Commit 86624046 authored by Thomas Huth's avatar Thomas Huth
Browse files

tests/acceptance: Add boot tests for sh4 QEMU advent calendar image 



Now that we can select the second serial console in the acceptance tests
(see commit 746f244d "Allow to use other serial consoles than default"),
we can also test the sh4 image from the QEMU advent calendar 2018.

Message-Id: <20200515164337.4899-1-thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent dc0ad02d

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ jobs: 
    - name: "GCC check-acceptance"

      dist: bionic

      env:

        - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu"

        - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sh4-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu"

        - TEST_CMD="make check-acceptance"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-acceptance"

      after_script:

tests/acceptance/boot_linux_console.py

+11 −2
Original line number Diff line number Diff line
@@ -858,12 +858,12 @@ class BootLinuxConsole(LinuxKernelTest): 
        console_pattern = 'No filesystem could mount root'

        self.wait_for_console_pattern(console_pattern)



    def do_test_advcal_2018(self, day, tar_hash, kernel_name):

    def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=0):

        tar_url = ('https://www.qemu-advent-calendar.org'

                   '/2018/download/day' + day + '.tar.xz')

        file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)

        archive.extract(file_path, self.workdir)

        self.vm.set_console()

        self.vm.set_console(console_index=console)

        self.vm.add_args('-kernel',

                         self.workdir + '/day' + day + '/' + kernel_name)

        self.vm.launch()
@@ -937,6 +937,15 @@ class BootLinuxConsole(LinuxKernelTest): 
        self.vm.add_args('-M', 'graphics=off')

        self.do_test_advcal_2018('15', tar_hash, 'invaders.elf')



    def test_sh4_r2d(self):

        """

        :avocado: tags=arch:sh4

        :avocado: tags=machine:r2d

        """

        tar_hash = 'fe06a4fd8ccbf2e27928d64472939d47829d4c7e'

        self.vm.add_args('-append', 'console=ttySC1')

        self.do_test_advcal_2018('09', tar_hash, 'zImage', console=1)



    def test_sparc_ss20(self):

        """

        :avocado: tags=arch:sparc