18:44 Pet, 15.05.2020. Thomas Huth <th...@redhat.com> је написао/ла:
>
> Now that we can select the second serial console in the acceptance tests
> (see commit 746f244d9720 "Allow to use other serial consoles than
default"),
> we can also test the sh4 image from the QEMU advent calendar 2018.
>
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
> I've split my original patch that also added yet another mips64 test...
> I hope it's easier to review/ack/merge this way this only addresses sh4
here.
>
It makes sense to me, Thomas. If I were you, I would do the same.
But, sorry, do you intend to send mips64 counterpart in future, or it is
already sent, but I somehow missed it?
Thanks in advance!
Aleksandar
> .travis.yml | 2 +-
> tests/acceptance/boot_linux_console.py | 13 +++++++++++--
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index fe708792ca..84b7f83ac4 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -291,7 +291,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:
> diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
> index c6b06a1a13..0653c8c1bf 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -826,12 +826,12 @@ class BootLinuxConsole(Test):
> 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()
> @@ -905,6 +905,15 @@ class BootLinuxConsole(Test):
> 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
> --
> 2.18.1
>
>
