tests/acceptance: Add boot tests for sh4 QEMU advent calendar image
PATCH 1/1 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 746f244d9720 "Allow to use other serial consoles than default"), we can also test the sh4 image from the QEMU advent calendar 2018.
---
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.
.travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-)
.travis.yml +1 -1
@@ -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:
tests/acceptance/boot_linux_console.py +11 -2
@@ -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
Signature · 1 line
2.18.1
Quoted 5 lines · Thomas Huth
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 <[email protected]>
Quoted 57 lines
---
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..travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-).travis.yml +1
-1@@ -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:tests/acceptance/boot_linux_console.py +11
-2@@ -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
18:44 Pet, 15.05.2020. Thomas Huth <[email protected]> је написао/ла:
Quoted 3 lines
Now that we can select the second serial console in the acceptance tests (see commit
746f244d9720"Allow to use other serial consoles than
default"),
Quoted 6 lines
we can also test the sh4 image from the QEMU advent calendar 2018.
Signed-off-by Thomas Huth <[email protected]>---
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.
Quoted 1 line
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 jobs: · line 294
Quoted 13 lines
.travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-).travis.yml +0
-1@@ -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"
.travis.yml jobs: · line 294
Quoted 1 line
.travis.yml +1
-0+ - 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"
Review
Quoted 4 lines
.travis.yml +0
-0- TEST_CMD="make check-acceptance" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-acceptance" after_script:(quoted diff) +0
-0
b/tests/acceptance/boot_linux_console.py
Quoted 38 lines
index
c6b06a1a13..0653c8c1bf100644tests/acceptance/boot_linux_console.py +11
-3@@ -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
Quoted 12 lines · Aleksandar Markovic
18:44 Pet, 15.05.2020. Thomas Huth <[email protected] <mailto:[email protected]>> је написао/ла:
Quoted 3 lines
Now that we can select the second serial console in the acceptance tests (see commit
746f244d9720"Allow to use other serial consoles thandefault"),
Quoted 6 lines
we can also test the sh4 image from the QEMU advent calendar 2018.
Signed-off-by Thomas Huth <[email protected] <mailto:[email protected]>>---
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
Quoted 7 lines
sh4 here.
Quoted 1 line
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?
Hi Aleksandar,
I was planning to send a separate patch, but then I noticed that there are already quite a lot of tests for the various flavors of the mips-malta machine in tests/acceptance/boot_linux_console.py ... so I currently doubt that the malta advent calendar image will add much value here?
Thomas
суб, 30. мај 2020. у 19:25 Thomas Huth <[email protected]> је написао/ла:
Quoted 22 lines · Aleksandar Markovic
Quoted 12 lines
18:44 Pet, 15.05.2020. Thomas Huth <[email protected] <mailto:[email protected]>> је написао/ла:
Quoted 3 lines
Now that we can select the second serial console in the acceptance tests (see commit
746f244d9720"Allow to use other serial consoles thandefault"),
Quoted 6 lines
we can also test the sh4 image from the QEMU advent calendar 2018.
Signed-off-by Thomas Huth <[email protected] <mailto:[email protected]>>---
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 addressesQuoted 7 lines
sh4 here.
Quoted 1 line
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?
Quoted 8 lines
Hi Aleksandar,
I was planning to send a separate patch, but then I noticed that there are already quite a lot of tests for the various flavors of the mips-malta machine in
tests/acceptance/boot_linux_console.py... so I currently doubt that the malta advent calendar image will add much value here?
I'm fine with your judgement.
Glad to see sh4 advent calendar.
Best wishes,
Aleksandar
Quoted 2 lines
Thomas