tests/acceptance: Add boot tests for some of the QEMU advent calendar images
PATCH 1/1 tests/acceptance: Add boot tests for some of the QEMU advent calendar images
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-)
.travis.yml +1 -1
@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + - CONFIG="--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" - TEST_CMD="make check-acceptance" after_script: - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat
tests/acceptance/boot_linux_console.py +96 -0
99 lines not on this page · raw message
Signature · 1 line
2.18.1
Quoted 9 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Signed-off-by Thomas Huth <[email protected]>
Quoted 5 lines
--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-)
Quoted 7 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Yes, please, removal of --python was in my wish list.
Quoted 12 lines
Signed-off-by Thomas Huth <[email protected]>--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +0
-0
.travis.yml matrix: · line 271
Quoted 5 lines
.travis.yml +1
-1@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + - CONFIG="--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"
Perhaps use MAIN_SOFTMMU_TARGETS in only append the other targets, like:
--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Quoted 107 lines
.travis.yml +0
-0- TEST_CMD="make check-acceptance" after_script: - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cattests/acceptance/boot_linux_console.py +96
-0@@ -584,3 +584,99 @@ class BootLinuxConsole(Test): self.wait_for_console_pattern(console_pattern) 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): + 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.add_args('-kernel', + self.workdir + '/day' + day + '/' + kernel_name) + self.vm.launch() + self.wait_for_console_pattern('QEMU advent calendar') + + def test_arm_vexpressa9(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:vexpress-a9 + """ + tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b' + self.vm.add_args('-dtb', self.workdir + '/day16/vexpress-v2p-ca9.dtb') + self.do_test_advcal_2018('16', tar_hash, 'winter.zImage') + + def test_m68k_mcf5208evb(self): + """ + :avocado: tags=arch:m68k + :avocado: tags=machine:mcf5208evb + """ + tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' + self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf') + + def test_microblaze_s3adsp1800(self): + """ + :avocado: tags=arch:microblaze + :avocado: tags=machine:petalogix-s3adsp1800 + """ + tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' + self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin') + + def test_or1k_sim(self): + """ + :avocado: tags=arch:or1k + :avocado: tags=machine:or1k-sim + """ + tar_hash = '20334cdaf386108c530ff0badaecc955693027dd' + self.do_test_advcal_2018('20', tar_hash, 'vmlinux') + + def test_nios2_10m50(self): + """ + :avocado: tags=arch:nios2 + :avocado: tags=machine:10m50-ghrd + """ + tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918' + self.do_test_advcal_2018('14', tar_hash, 'vmlinux.elf') + + def test_ppc64_e500(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:ppce500 + """ + tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' + self.vm.add_args('-cpu', 'e5500') + self.do_test_advcal_2018('19', tar_hash, 'uImage') + + def test_ppc_g3beige(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:g3beige + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_ppc_mac99(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:mac99 + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_sparc_ss20(self): + """ + :avocado: tags=arch:sparc + :avocado: tags=machine:SS-20 + """ + tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f' + self.do_test_advcal_2018('11', tar_hash, 'zImage.elf') + + def test_xtensa_lx60(self): + """ + :avocado: tags=arch:xtensa + :avocado: tags=machine:lx60 + """ + tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34' + self.vm.add_args('-cpu', 'dc233c') + self.do_test_advcal_2018('02', tar_hash, 'santas-sleigh-ride.elf')
Quoted 29 lines · Wainer dos Santos Moschetta
Quoted 7 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Yes, please, removal of --python was in my wish list.
Quoted 17 lines
Signed-off-by Thomas Huth <[email protected]>---
.travis.yml | 2 +-tests/acceptance/boot_linux_console.py| 96 ++++++++++++++++++++++++++2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +0
-0@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests- env:
- - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu"
Quoted 8 lines
Quoted 3 lines
+ - CONFIG="--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"
Perhaps use
MAIN_SOFTMMU_TARGETSin only append the other targets, like:--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Not sure ... while it is a nice way to shorten the line here, it adds a dependecy to that variable ... and MAIN_SOFTMMU_TARGETS has been changed a couple of times during the course of time, so we might risk to lose some testing coverage here in case someone removes a target from MAIN_SOFTMMU_TARGETS but forgets to add it here again...? I think we should better use the explicit list here instead.
Thomas
Quoted 6 lines · Thomas Huth
Quoted 5 lines · Wainer dos Santos Moschetta
Quoted 3 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Excellent idea!
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
I'd rather see this change as another commit.
Quoted 27 lines
Quoted 27 lines
Yes, please, removal of --python was in my wish list.
Quoted 17 lines
Signed-off-by Thomas Huth <[email protected]>---
.travis.yml | 2 +-tests/acceptance/boot_linux_console.py| 96 ++++++++++++++++++++++++++2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +0
-0@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests- env:
- - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu"Quoted 3 lines
+ - CONFIG="--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"
Perhaps use
MAIN_SOFTMMU_TARGETSin only append the other targets, like:
Quoted 8 lines
Quoted 1 line
--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Not sure ... while it is a nice way to shorten the line here, it adds a dependecy to that variable ... and
MAIN_SOFTMMU_TARGETShas been changed a couple of times during the course of time, so we might risk to lose some testing coverage here in case someone removes a target fromMAIN_SOFTMMU_TARGETSbut forgets to add it here again...? I think we should better use the explicit list here instead.
Maybe related: "Split enterprise vs. hobbyist acceptance test job"
https://www.mail-archive.com/[email protected]/msg644683.html
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Thomas Huth
Quoted 5 lines · Wainer dos Santos Moschetta
Quoted 3 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Quoted 8 lines
Excellent idea!
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
I'd rather see this change as another commit.
I thought so, too, often it is good to separate stuff into separate commits, but in this case, it's not source code but just the CI yml file, and the change is really trivial, so it rather sounds like superfluous churn to me in this case to do it in a separate patch...
Quoted 35 lines
Quoted 26 lines
Quoted 26 lines
Yes, please, removal of --python was in my wish list.
Quoted 17 lines
Signed-off-by Thomas Huth <[email protected]>---
.travis.yml | 2 +-tests/acceptance/boot_linux_console.py| 96 ++++++++++++++++++++++++++2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +0
-0@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests- env:
- - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu"Quoted 3 lines
+ - CONFIG="--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"
Perhaps use
MAIN_SOFTMMU_TARGETSin only append the other targets, like:Quoted 8 lines
Quoted 1 line
--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Not sure ... while it is a nice way to shorten the line here, it adds a dependency to that variable ... and
MAIN_SOFTMMU_TARGETShas been changed a couple of times during the course of time, so we might risk to lose some testing coverage here in case someone removes a target fromMAIN_SOFTMMU_TARGETSbut forgets to add it here again...? I think we should better use the explicit list here instead.
Quoted 2 lines
Maybe related: "Split enterprise vs. hobbyist acceptance test job"
https://www.mail-archive.com/[email protected]/msg644683.html
I guess naming/splitting is hard in this case ... many targets contain both, "enterprise" and "hobbyist" machines ... and as long as the Travis job runs reasonably fast, it's also not really necessary to split it. The only real ugliness is the very long line - I haven't found a way yet to correctly wrap this in the YML file to multiple lines .... does anybody know how to do this in YML?
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
Thomas
Quoted 49 lines · Thomas Huth
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Thomas Huth
Quoted 4 lines · Wainer dos Santos Moschetta
Quoted 3 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Quoted 6 lines
Excellent idea!
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
I'd rather see this change as another commit.
I thought so, too, often it is good to separate stuff into separate commits, but in this case, it's not source code but just the CI yml file, and the change is really trivial, so it rather sounds like superfluous churn to me in this case to do it in a separate patch...
Quoted 31 lines
Quoted 31 lines
Quoted 18 lines
Yes, please, removal of --python was in my wish list.
Quoted 16 lines
Signed-off-by Thomas Huth <[email protected]>--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +0
-2@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu"Quoted 7 lines
Quoted 3 lines
.travis.yml +1
-0+ -CONFIG="--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"
Perhaps use
MAIN_SOFTMMU_TARGETSin only append the other targets, like:--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Not sure ... while it is a nice way to shorten the line here, it adds a dependency to that variable ... and
MAIN_SOFTMMU_TARGETShas been changed a couple of times during the course of time, so we might risk to lose some testing coverage here in case someone removes a target fromMAIN_SOFTMMU_TARGETSbut forgets to add it here again...? I think we should better use the explicit list here instead.
Quoted 8 lines
Quoted 2 lines
Maybe related: "Split enterprise vs. hobbyist acceptance test job"
https://www.mail-archive.com/[email protected]/msg644683.htmlI guess naming/splitting is hard in this case ... many targets contain both, "enterprise" and "hobbyist" machines ... and as long as the Travis job runs reasonably fast, it's also not really necessary to split it. The only real ugliness is the very long line - I haven't found a way yet to correctly wrap this in the YML file to multiple lines .... does anybody know how to do this in YML?
Try to break the lines with '\' (note: next line should not be indented). It worked out on following code:
[wainersm@localhost ~]$ cat /tmp/foo.py
import yaml
yml="""
matrix:
include:
- env:
- CONFIG="-target-list=x86_64-softmmu,\
mips-softmmu,mips64el-softmmu"
"""
print(yaml.safe_load(yml))
[wainersm@localhost ~]$ python3 /tmp/foo.py
{'matrix': {'include': [{'env': ['CONFIG="-target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu"']}]}}
Quoted 6 lines
Quoted 3 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Thanks!
Thomas
Quoted 75 lines · Wainer dos Santos Moschetta
Quoted 57 lines · Thomas Huth
Quoted 7 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Thomas Huth
Quoted 5 lines · Wainer dos Santos Moschetta
Quoted 4 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images
for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.Quoted 8 lines
Excellent idea!
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Let's also make sure that we build the corresponding machines in Travis,
and while we're there, drop the superfluous --python parameter (python3
is now the only supported version anyway).I'd rather see this change as another commit.
I thought so, too, often it is good to separate stuff into separate commits, but in this case, it's not source code but just the CI yml file, and the change is really trivial, so it rather sounds like superfluous churn to me in this case to do it in a separate patch...
Quoted 36 lines
Quoted 36 lines
Quoted 28 lines
Yes, please, removal of --python was in my wish list.
Quoted 18 lines
Signed-off-by Thomas Huth <[email protected]>---
.travis.yml | 2 +-
tests/acceptance/boot_linux_console.py| 96
++++++++++++++++++++++++++2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +0
-0@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests- env:
- - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu"Quoted 4 lines
+ - CONFIG="--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"
Perhaps use
MAIN_SOFTMMU_TARGETSin only append the other targets, like:Quoted 1 line
--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Not sure ... while it is a nice way to shorten the line here, it adds a dependency to that variable ... and
MAIN_SOFTMMU_TARGETShas been changed
a couple of times during the course of time, so we might risk to lose some testing coverage here in case someone removes a target fromMAIN_SOFTMMU_TARGETSbut forgets to add it here again...? I think we should better use the explicit list here instead.Quoted 8 lines
Quoted 2 lines
Maybe related: "Split enterprise vs. hobbyist acceptance test job"
https://www.mail-archive.com/[email protected]/msg644683.htmlI guess naming/splitting is hard in this case ... many targets contain both, "enterprise" and "hobbyist" machines ... and as long as the Travis job runs reasonably fast, it's also not really necessary to split it. The only real ugliness is the very long line - I haven't found a way yet to correctly wrap this in the YML file to multiple lines .... does anybody know how to do this in YML?
Try to break the lines with '\' (note: next line should not be indented). It worked out on following code:
[wainersm@localhost ~]$ cat
/tmp/foo.py
import yaml
Quoted 7 lines
yml="""
matrix:
include:
- env:
- CONFIG="-target-list=x86_64-softmmu,\
mips-softmmu,mips64el-softmmu"
"""
Ok, thanks ... but without indentation, it looks somewhat ugly, too. ... hmm, maybe we should just keep adding acceptance tests until we've got all targets covered, then we can simply replace --target-list with --disable-user instead :-)
Thomas
Quoted 33 lines · Thomas Huth
Quoted 32 lines · Wainer dos Santos Moschetta
Quoted 7 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Yes, please, removal of --python was in my wish list.
Quoted 17 lines
Signed-off-by Thomas Huth <[email protected]>--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +1
-2@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + -Quoted 2 lines
CONFIG="--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"
Perhaps use
MAIN_SOFTMMU_TARGETSin only append the other targets, like:
Quoted 7 lines
Quoted 1 line
--target-list=${MAIN_SOFTMMU_TARGETS},alpha-softmmu,sparc-softmmu,....
Not sure ... while it is a nice way to shorten the line here, it adds a dependecy to that variable ... and
MAIN_SOFTMMU_TARGETShas been changed a couple of times during the course of time, so we might risk to lose some testing coverage here in case someone removes a target fromMAIN_SOFTMMU_TARGETSbut forgets to add it here again...? I think we should better use the explicit list here instead.
Your reasoning makes sense to me. Feel free to ignore my suggestion.
Thanks,
Wainer
Quoted 4 lines
Thomas
Quoted 95 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Signed-off-by Thomas Huth <[email protected]>--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +1
-1@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + - CONFIG="--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" - TEST_CMD="make check-acceptance" after_script: - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cattests/acceptance/boot_linux_console.py +60
-0@@ -584,3 +584,99 @@ class BootLinuxConsole(Test): self.wait_for_console_pattern(console_pattern) 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): + 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.add_args('-kernel', + self.workdir + '/day' + day + '/' + kernel_name) + self.vm.launch() + self.wait_for_console_pattern('QEMU advent calendar') + + def test_arm_vexpressa9(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:vexpress-a9 + """ + tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b' + self.vm.add_args('-dtb', self.workdir + '/day16/vexpress-v2p-ca9.dtb') + self.do_test_advcal_2018('16', tar_hash, 'winter.zImage') + + def test_m68k_mcf5208evb(self): + """ + :avocado: tags=arch:m68k + :avocado: tags=machine:mcf5208evb + """ + tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' + self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf') + + def test_microblaze_s3adsp1800(self): + """ + :avocado: tags=arch:microblaze + :avocado: tags=machine:petalogix-s3adsp1800 + """ + tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' + self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin') + + def test_or1k_sim(self): + """ + :avocado: tags=arch:or1k + :avocado: tags=machine:or1k-sim + """ + tar_hash = '20334cdaf386108c530ff0badaecc955693027dd' + self.do_test_advcal_2018('20', tar_hash, 'vmlinux') + + def test_nios2_10m50(self): + """ + :avocado: tags=arch:nios2 + :avocado: tags=machine:10m50-ghrd + """ + tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918' + self.do_test_advcal_2018('14', tar_hash, 'vmlinux.elf') + + def test_ppc64_e500(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:ppce500 + """ + tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' + self.vm.add_args('-cpu', 'e5500')
tests/acceptance/boot_linux_console.py class BootLinuxConsole(Test): · line 656
Quoted 10 lines
tests/acceptance/boot_linux_console.py +10
-0+ self.do_test_advcal_2018('19', tar_hash, 'uImage') + + def test_ppc_g3beige(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:g3beige + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf')
Hi Thomas, let me check one thing...
The VM will be launched as:
----
ppc-softmmu/qemu-system-ppc -display none -vga none -chardev socket,id=mon,path=/tmp/tmpvdokyvs3/qemu-41146-monitor.sock -mon chardev=mon,mode=control -machine g3beige -chardev socket,id=console,path=/tmp/tmpvdokyvs3/qemu-41146-console.sock,server,nowait -serial chardev:console -M graphics=off -kernel /tmp/avocado_g3uccfo5/avocado_job_61gglyz3/02-tests_acceptance_boot_linux_console.py_BootLinuxConsole.test_ppc_g3beige/day15/invaders.elf
----
Note that it passes '[..] -machine g3beige [...] -M graphics=off [...]'. I suspect you wanted '-machine g3beige,graphics=off'. am I right? or QEMU will interpret the -M option as a parameter of the already set machine type? or the -M overwrites -machine, and because g3beige is the default type it just works?
Anyway, It happens that avocado_qemu will automatically convert the ':avocado: tags=machine:g3beige' into QEMU's '-machine g3beige', but self.vm.add_args('-M', 'graphics=off') doesn't actually append 'graphics=off to '-machine' (i.e. add_args` appends to QEMU's parameters list instead). So if you want '-machine g3beige,graphics=off' you should overwrite its value with:
self.vm.set_machine('-machine g3beige,graphics=off')
Thanks,
Wainer
Quoted 26 lines
tests/acceptance/boot_linux_console.py +26
-0+ + def test_ppc_mac99(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:mac99 + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_sparc_ss20(self): + """ + :avocado: tags=arch:sparc + :avocado: tags=machine:SS-20 + """ + tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f' + self.do_test_advcal_2018('11', tar_hash, 'zImage.elf') + + def test_xtensa_lx60(self): + """ + :avocado: tags=arch:xtensa + :avocado: tags=machine:lx60 + """ + tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34' + self.vm.add_args('-cpu', 'dc233c') + self.do_test_advcal_2018('02', tar_hash, 'santas-sleigh-ride.elf')
Quoted 12 lines · Wainer dos Santos Moschetta
Quoted 10 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Signed-off-by Thomas Huth <[email protected]>---
[...]
Quoted 23 lines
Quoted 8 lines
+ def
test_ppc_g3beige(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:g3beige
+ """
+tar_hash= 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' +self.vm.add_args('-M', 'graphics=off')
+self.do_test_advcal_2018('15', tar_hash, 'invaders.elf')Hi Thomas, let me check one thing...
The VM will be launched as:
----
ppc-softmmu/qemu-system-ppc -display none -vga none -chardev socket,id=mon,path=/tmp/tmpvdokyvs3/qemu-41146-monitor.sock -mon
chardev=mon,mode=control -machine g3beige -chardev socket,id=console,path=/tmp/tmpvdokyvs3/qemu-41146-console.sock,server,nowait
-serial chardev:console -M graphics=off -kernel/tmp/avocado_g3uccfo5/avocado_job_61gglyz3/02-tests_acceptance_boot_linux_console.py_BootLinuxConsole.test_ppc_g3beige/day15/invaders.elf
Quoted 4 lines
----
Note that it passes '[..] -machine g3beige [...] -M graphics=off [...]'. I suspect you wanted '-machine g3beige,graphics=off'. am I right?
No, the -M graphics=off was intended.
Quoted 3 lines
or
QEMU will interpret the -M option as a parameter of the already set machine type?
That's exactly the case.
Quoted 2 lines
or the -M overwrites -machine, and because g3beige is the default type it just works?
No, the default machine of qemu-system-ppc is mac99.
And just to make sure that the g3beige test is really running with a G3 and not a G4 (i.e. mac99):
$ avocado --show=console run tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_ppc_g3beige | grep motherboard console: PowerMac motherboard: PowerMac G3 (Silk)
Thomas
Quoted 47 lines · Thomas Huth
Quoted 11 lines · Wainer dos Santos Moschetta
Quoted 10 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Signed-off-by Thomas Huth <[email protected]>---
[...]
Quoted 23 lines
Quoted 8 lines
+ def
test_ppc_g3beige(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:g3beige
+ """
+tar_hash= 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' +self.vm.add_args('-M', 'graphics=off')
+self.do_test_advcal_2018('15', tar_hash, 'invaders.elf')Hi Thomas, let me check one thing...
The VM will be launched as:
----
ppc-softmmu/qemu-system-ppc -display none -vga none -chardev socket,id=mon,path=/tmp/tmpvdokyvs3/qemu-41146-monitor.sock -mon
chardev=mon,mode=control -machine g3beige -chardev socket,id=console,path=/tmp/tmpvdokyvs3/qemu-41146-console.sock,server,nowait
-serial chardev:console -M graphics=off -kernel/tmp/avocado_g3uccfo5/avocado_job_61gglyz3/02-tests_acceptance_boot_linux_console.py_BootLinuxConsole.test_ppc_g3beige/day15/invaders.elfQuoted 4 lines
----
Note that it passes '[..] -machine g3beige [...] -M graphics=off [...]'. I suspect you wanted '-machine g3beige,graphics=off'. am I right?
No, the -M graphics=off was intended.
Quoted 3 lines
or
QEMU will interpret the -M option as a parameter of the already set machine type?
Quoted 6 lines
That's exactly the case.
Quoted 2 lines
or the -M overwrites -machine, and because g3beige is the default type it just works?
No, the default machine of qemu-system-ppc is mac99.
I think you're wrong about the default machine type:
$ qemu-system-ppc -M help Supported machines are: 40p IBM RS/6000 7020 (40p) bamboo bamboo g3beige Heathrow based PowerMAC (default)
g3beige is marked as default and seems to be created without any -M option but having two -M options e.g. -M mac99 -M graphics=off creates mac99 machine so multiple options seem to work as you described.
Regards,
BALATON Zoltan
Quoted 60 lines · BALATON Zoltan
Quoted 50 lines · Thomas Huth
Quoted 12 lines · Wainer dos Santos Moschetta
Quoted 11 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis,
and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).Signed-off-by Thomas Huth <[email protected]>---
[...]
Quoted 25 lines
Quoted 8 lines
+ def
test_ppc_g3beige(self):
+ """
+ :avocado: tags=arch:ppc
+ :avocado: tags=machine:g3beige
+ """
+tar_hash= 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' +self.vm.add_args('-M', 'graphics=off')
+self.do_test_advcal_2018('15', tar_hash, 'invaders.elf')Hi Thomas, let me check one thing...
The VM will be launched as:
----
ppc-softmmu/qemu-system-ppc -display none -vga none -chardev socket,id=mon,path=/tmp/tmpvdokyvs3/qemu-41146-monitor.sock -mon chardev=mon,mode=control -machine g3beige -chardev socket,id=console,path=/tmp/tmpvdokyvs3/qemu-41146-console.sock,server,nowait
-serial chardev:console -M graphics=off -kernel
/tmp/avocado_g3uccfo5/avocado_job_61gglyz3/02-tests_acceptance_boot_linux_console.py_BootLinuxConsole.test_ppc_g3beige/day15/invaders.elfQuoted 4 lines
----
Note that it passes '[..] -machine g3beige [...] -M graphics=off [...]'. I suspect you wanted '-machine g3beige,graphics=off'. am I right?
No, the -M graphics=off was intended.
Quoted 3 lines
or
QEMU will interpret the -M option as a parameter of the already set machine type?Quoted 6 lines
That's exactly the case.
Quoted 2 lines
or the -M overwrites -machine, and because g3beige is the default type it just works?
No, the default machine of qemu-system-ppc is mac99.
I think you're wrong about the default machine type:
Quoted 8 lines
$ qemu-system-ppc -M help Supported machines are: 40p IBM RS/6000 7020 (40p) bamboo bamboo g3beige Heathrow based PowerMAC (default)g3beige is marked as default and seems to be created without any -M option
Oops, thanks, I stand corrected.
Thomas
Quoted 8 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Quoted 5 lines
Signed-off-by Thomas Huth <[email protected]>--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-)
Overall result from the discussions I raised on this thread: this patch is ready to go as is, IMO.
Thanks Thomas!
- Wainer
Quoted 118 lines
.travis.yml +1
-1@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + - CONFIG="--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" - TEST_CMD="make check-acceptance" after_script: - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cattests/acceptance/boot_linux_console.py +96
-0@@ -584,3 +584,99 @@ class BootLinuxConsole(Test): self.wait_for_console_pattern(console_pattern) 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): + 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.add_args('-kernel', + self.workdir + '/day' + day + '/' + kernel_name) + self.vm.launch() + self.wait_for_console_pattern('QEMU advent calendar') + + def test_arm_vexpressa9(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:vexpress-a9 + """ + tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b' + self.vm.add_args('-dtb', self.workdir + '/day16/vexpress-v2p-ca9.dtb') + self.do_test_advcal_2018('16', tar_hash, 'winter.zImage') + + def test_m68k_mcf5208evb(self): + """ + :avocado: tags=arch:m68k + :avocado: tags=machine:mcf5208evb + """ + tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' + self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf') + + def test_microblaze_s3adsp1800(self): + """ + :avocado: tags=arch:microblaze + :avocado: tags=machine:petalogix-s3adsp1800 + """ + tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' + self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin') + + def test_or1k_sim(self): + """ + :avocado: tags=arch:or1k + :avocado: tags=machine:or1k-sim + """ + tar_hash = '20334cdaf386108c530ff0badaecc955693027dd' + self.do_test_advcal_2018('20', tar_hash, 'vmlinux') + + def test_nios2_10m50(self): + """ + :avocado: tags=arch:nios2 + :avocado: tags=machine:10m50-ghrd + """ + tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918' + self.do_test_advcal_2018('14', tar_hash, 'vmlinux.elf') + + def test_ppc64_e500(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:ppce500 + """ + tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' + self.vm.add_args('-cpu', 'e5500') + self.do_test_advcal_2018('19', tar_hash, 'uImage') + + def test_ppc_g3beige(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:g3beige + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_ppc_mac99(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:mac99 + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_sparc_ss20(self): + """ + :avocado: tags=arch:sparc + :avocado: tags=machine:SS-20 + """ + tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f' + self.do_test_advcal_2018('11', tar_hash, 'zImage.elf') + + def test_xtensa_lx60(self): + """ + :avocado: tags=arch:xtensa + :avocado: tags=machine:lx60 + """ + tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34' + self.vm.add_args('-cpu', 'dc233c') + self.do_test_advcal_2018('02', tar_hash, 'santas-sleigh-ride.elf')
Philippe Mathieu-Daudé
AppliedQuoted 122 lines · Thomas Huth
The 2018 edition of the QEMU advent calendar 2018 featured Linux images for various non-x86 machines. We can use them for a boot tests in our acceptance test suite.
Let's also make sure that we build the corresponding machines in Travis, and while we're there, drop the superfluous --python parameter (python3 is now the only supported version anyway).
Signed-off-by Thomas Huth <[email protected]>--- .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 96 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-).travis.yml +1
-1@@ -268,7 +268,7 @@ matrix: # Acceptance (Functional) tests - env: - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" + - CONFIG="--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" - TEST_CMD="make check-acceptance" after_script: - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cattests/acceptance/boot_linux_console.py +86
-0@@ -584,3 +584,99 @@ class BootLinuxConsole(Test): self.wait_for_console_pattern(console_pattern) 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): + 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.add_args('-kernel', + self.workdir + '/day' + day + '/' + kernel_name) + self.vm.launch() + self.wait_for_console_pattern('QEMU advent calendar') + + def test_arm_vexpressa9(self): + """ + :avocado: tags=arch:arm + :avocado: tags=machine:vexpress-a9 + """ + tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b' + self.vm.add_args('-dtb', self.workdir + '/day16/vexpress-v2p-ca9.dtb') + self.do_test_advcal_2018('16', tar_hash, 'winter.zImage') + + def test_m68k_mcf5208evb(self): + """ + :avocado: tags=arch:m68k + :avocado: tags=machine:mcf5208evb + """ + tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' + self.do_test_advcal_2018('07', tar_hash, 'sanity-clause.elf') + + def test_microblaze_s3adsp1800(self): + """ + :avocado: tags=arch:microblaze + :avocado: tags=machine:petalogix-s3adsp1800 + """ + tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' + self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin') + + def test_or1k_sim(self): + """ + :avocado: tags=arch:or1k + :avocado: tags=machine:or1k-sim + """ + tar_hash = '20334cdaf386108c530ff0badaecc955693027dd' + self.do_test_advcal_2018('20', tar_hash, 'vmlinux') + + def test_nios2_10m50(self): + """ + :avocado: tags=arch:nios2 + :avocado: tags=machine:10m50-ghrd + """ + tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918' + self.do_test_advcal_2018('14', tar_hash, 'vmlinux.elf') + + def test_ppc64_e500(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:ppce500 + """ + tar_hash = '6951d86d644b302898da2fd701739c9406527fe1' + self.vm.add_args('-cpu', 'e5500') + self.do_test_advcal_2018('19', tar_hash, 'uImage') + + def test_ppc_g3beige(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:g3beige + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_ppc_mac99(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:mac99 + """ + tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' + self.vm.add_args('-M', 'graphics=off') + self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + + def test_sparc_ss20(self): + """ + :avocado: tags=arch:sparc + :avocado: tags=machine:SS-20 + """ + tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f'
tests/acceptance/boot_linux_console.py class BootLinuxConsole(Test): · line 682
Quoted 10 lines
tests/acceptance/boot_linux_console.py +10
-0+ self.do_test_advcal_2018('11', tar_hash, 'zImage.elf') + + def test_xtensa_lx60(self): + """ + :avocado: tags=arch:xtensa + :avocado: tags=machine:lx60 + """ + tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34' + self.vm.add_args('-cpu', 'dc233c') + self.do_test_advcal_2018('02', tar_hash, 'santas-sleigh-ride.elf')
Thanks, applied to my python-next tree:
https://gitlab.com/philmd/qemu/commits/python-next