diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-06 14:21:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-06 14:21:41 +0000 |
| commit | 20e0d439a6ded635ec89f6135c08cd5541c68962 (patch) | |
| tree | d0aa6765c85d66876f3719276f46878dd065efb5 /tests | |
| parent | 2b3805f370521deacab974b9c9ca07d2319a8890 (diff) | |
| parent | edf90bd0af98bf03ec1e60e5c7632774f62837d8 (diff) | |
| download | qemu-20e0d439a6ded635ec89f6135c08cd5541c68962.zip qemu-20e0d439a6ded635ec89f6135c08cd5541c68962.tar.gz qemu-20e0d439a6ded635ec89f6135c08cd5541c68962.tar.bz2 | |
Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180204' into staging
hppa-softmmu update
# gpg: Signature made Sun 04 Feb 2018 22:20:40 GMT
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-hppa-20180204:
roms/seabios-hppa: Update submodule and image
tests: Enable boot-serial-test for hppa
hw/hppa: Use qemu_log_mask instead of fprintf to stderr
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/boot-serial-test.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index ca82e0c..83def69 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -299,6 +299,8 @@ gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y) check-qtest-alpha-y = tests/boot-serial-test$(EXESUF) +check-qtest-hppa-y = tests/boot-serial-test$(EXESUF) + check-qtest-m68k-y = tests/boot-serial-test$(EXESUF) check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index 418c5b9..ea87a80 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -87,6 +87,7 @@ static testdef_t tests[] = { sizeof(kernel_plml605), kernel_plml605 }, { "moxie", "moxiesim", "", "TT", sizeof(bios_moxiesim), 0, bios_moxiesim }, { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, + { "hppa", "hppa", "", "SeaBIOS wants SYSTEM HALT" }, { NULL } }; |