Received: from eggs.gnu.org ([209.51.188.92]:37219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLaLS-00080v-9Y for qemu-devel@nongnu.org; Tue, 30 Apr 2019 17:31:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLaLR-000079-94 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 17:31:22 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33664) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLaLQ-00006l-Um for qemu-devel@nongnu.org; Tue, 30 Apr 2019 17:31:21 -0400 Received: by mail-wr1-x441.google.com with SMTP id s18so22745325wrp.0 for ; Tue, 30 Apr 2019 14:31:20 -0700 (PDT) References: <20190424103747.10173-1-thuth@redhat.com> <20190424103747.10173-2-thuth@redhat.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20190424103747.10173-2-thuth@redhat.com> Date: Tue, 30 Apr 2019 22:31:17 +0100 Message-ID: <87h8af6uze.fsf@zen.linaroharston> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/6] tests/qemu-iotests/check: Pick a default machine if necessary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: qemu-devel@nongnu.org, Fam Zheng , qemu-block@nongnu.org, Ed Maste , Kevin Wolf , Max Reitz , Li-Wen Hsu , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Thomas Huth writes: > qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have > a default machine, so when running the qemu-iotests with such a binary, > lots of tests are failing. Fix it by picking a default machine in the > "check" script instead. > > Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e > --- > tests/qemu-iotests/check | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > index f9c24b6753..922c5d1d3d 100755 > --- a/tests/qemu-iotests/check > +++ b/tests/qemu-iotests/check > @@ -130,7 +130,6 @@ export CACHEMODE=3D"writeback" > export QEMU_IO_OPTIONS=3D"" > export QEMU_IO_OPTIONS_NO_FMT=3D"" > export CACHEMODE_IS_DEFAULT=3Dtrue > -export QEMU_OPTIONS=3D"-nodefaults -machine accel=3Dqtest" > export VALGRIND_QEMU=3D > export IMGKEYSECRET=3D > export IMGOPTSSYNTAX=3Dfalse > @@ -564,6 +563,18 @@ then > fi > export QEMU_PROG=3D"$(type -p "$QEMU_PROG")" > > +case "$QEMU_PROG" in > + *qemu-system-arm|*qemu-system-aarch64) > + export QEMU_OPTIONS=3D"-nodefaults -machine virt,accel=3Dqtest" > + ;; > + *qemu-system-tricore) > + export QEMU_OPTIONS=3D"-nodefaults -machine tricore_testboard,ac= cel=3Dqtest" > + ;; > + *) > + export QEMU_OPTIONS=3D"-nodefaults -machine accel=3Dqtest" > + ;; > +esac > + > if [ -z "$QEMU_IMG_PROG" ]; then > if [ -x "$build_iotests/qemu-img" ]; then > export QEMU_IMG_PROG=3D"$build_iotests/qemu-img" -- Alex Benn=C3=A9e