From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Kevin Wolf <kwolf@redhat.com>
Cc: qemu-block@nongnu.org
Subject: [PATCH for-5.1] iotests: Select a default machine for the rx and avr targets
Date: Wed, 22 Jul 2020 18:19:08 +0200 [thread overview]
Message-ID: <20200722161908.25383-1-thuth@redhat.com> (raw)
If you are building only with either the new rx-softmmu or avr-softmmu
target, "make check-block" fails a couple of tests since there is no
default machine defined in these new targets. We have to select a machine
in the "check" script for these, just like we already do for the arm- and
tricore-softmmu targets.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/check | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index e0d8049012..0657f7286c 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -595,15 +595,19 @@ then
fi
export QEMU_PROG="$(type -p "$QEMU_PROG")"
+export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
case "$QEMU_PROG" in
*qemu-system-arm|*qemu-system-aarch64)
- export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
+ export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
;;
- *qemu-system-tricore)
- export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
+ *qemu-system-avr)
+ export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"
+ ;;
+ *qemu-system-rx)
+ export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"
;;
- *)
- export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
+ *qemu-system-tricore)
+ export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"
;;
esac
--
2.18.1
next reply other threads:[~2020-07-22 16:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 16:19 Thomas Huth [this message]
2020-07-24 8:24 ` [PATCH for-5.1] iotests: Select a default machine for the rx and avr targets Max Reitz
2020-07-24 9:32 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200722161908.25383-1-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).