| Message ID | 20200722161908.25383-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-5.1] iotests: Select a default machine for the rx and avr targets | expand |
On 22.07.20 18:19, Thomas Huth wrote: > 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(-) Thanks, applied to my block branch: https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Hi Max/Kevin, On 7/24/20 10:24 AM, Max Reitz wrote: > On 22.07.20 18:19, Thomas Huth wrote: >> 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. I guess remember I already asked on IRC but can't find the log, so better ask again on the list. Why can't we use the 'none' machine for the block tests? What part of the machines is required? I was thinking maybe busses, but apparently not (example with these 2 machines). Thanks, Phil. >> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> tests/qemu-iotests/check | 14 +++++++++----- >> 1 file changed, 9 insertions(+), 5 deletions(-) > > Thanks, applied to my block branch: > > https://git.xanclic.moe/XanClic/qemu/commits/branch/block >
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
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(-)