Received: from eggs.gnu.org ([209.51.188.92]:52432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKm97-0007ju-KG for qemu-devel@nongnu.org; Sun, 28 Apr 2019 11:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKm96-0004t7-Nk for qemu-devel@nongnu.org; Sun, 28 Apr 2019 11:55:17 -0400 From: Thomas Huth Date: Sun, 28 Apr 2019 17:54:46 +0200 Message-Id: <20190428155451.15653-4-thuth@redhat.com> In-Reply-To: <20190428155451.15653-1-thuth@redhat.com> References: <20190428155451.15653-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , qemu-block@nongnu.org, Eric Blake , Ed Maste , Christophe Fergeau , Kevin Wolf , Max Reitz , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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 --- 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")" =20 +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" --=20 2.21.0