From: Thomas Huth <thuth@redhat.com> To: qemu-devel@nongnu.org Cc: "Fam Zheng" <fam@euphon.net>, qemu-block@nongnu.org, "Eric Blake" <eblake@redhat.com>, "Ed Maste" <emaste@freebsd.org>, "Christophe Fergeau" <cfergeau@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>, "Max Reitz" <mreitz@redhat.com>, "Li-Wen Hsu" <lwhsu@freebsd.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org> Subject: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary Date: Sun, 28 Apr 2019 17:54:46 +0200 [thread overview] Message-ID: <20190428155451.15653-4-thuth@redhat.com> (raw) In-Reply-To: <20190428155451.15653-1-thuth@redhat.com> 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 <thuth@redhat.com> --- 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="writeback" export QEMU_IO_OPTIONS="" export QEMU_IO_OPTIONS_NO_FMT="" export CACHEMODE_IS_DEFAULT=true -export QEMU_OPTIONS="-nodefaults -machine accel=qtest" export VALGRIND_QEMU= export IMGKEYSECRET= export IMGOPTSSYNTAX=false @@ -564,6 +563,18 @@ then fi export QEMU_PROG="$(type -p "$QEMU_PROG")" +case "$QEMU_PROG" in + *qemu-system-arm|*qemu-system-aarch64) + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest" + ;; + *qemu-system-tricore) + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest" + ;; + *) + export QEMU_OPTIONS="-nodefaults -machine accel=qtest" + ;; +esac + if [ -z "$QEMU_IMG_PROG" ]; then if [ -x "$build_iotests/qemu-img" ]; then export QEMU_IMG_PROG="$build_iotests/qemu-img" -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Huth <thuth@redhat.com> To: qemu-devel@nongnu.org Cc: "Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>, "Ed Maste" <emaste@freebsd.org>, qemu-block@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Christophe Fergeau" <cfergeau@redhat.com>, "Max Reitz" <mreitz@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Li-Wen Hsu" <lwhsu@freebsd.org> Subject: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary Date: Sun, 28 Apr 2019 17:54:46 +0200 [thread overview] Message-ID: <20190428155451.15653-4-thuth@redhat.com> (raw) Message-ID: <20190428155446.5e7y-Eqx2o6A7gvnOgHbSEVAK-LW-BRSokVxvhNv5O8@z> (raw) In-Reply-To: <20190428155451.15653-1-thuth@redhat.com> 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 <thuth@redhat.com> --- 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="writeback" export QEMU_IO_OPTIONS="" export QEMU_IO_OPTIONS_NO_FMT="" export CACHEMODE_IS_DEFAULT=true -export QEMU_OPTIONS="-nodefaults -machine accel=qtest" export VALGRIND_QEMU= export IMGKEYSECRET= export IMGOPTSSYNTAX=false @@ -564,6 +563,18 @@ then fi export QEMU_PROG="$(type -p "$QEMU_PROG")" +case "$QEMU_PROG" in + *qemu-system-arm|*qemu-system-aarch64) + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest" + ;; + *qemu-system-tricore) + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest" + ;; + *) + export QEMU_OPTIONS="-nodefaults -machine accel=qtest" + ;; +esac + if [ -z "$QEMU_IMG_PROG" ]; then if [ -x "$build_iotests/qemu-img" ]; then export QEMU_IMG_PROG="$build_iotests/qemu-img" -- 2.21.0
next prev parent reply other threads:[~2019-04-28 15:55 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-28 15:54 [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check" Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 1/8] tests/qemu-iotests: Fix output of qemu-io related tests Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-05-01 10:24 ` Alex Bennée 2019-05-01 10:24 ` Alex Bennée 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-05-01 11:08 ` Alex Bennée 2019-05-01 11:08 ` Alex Bennée 2019-05-01 12:06 ` Eric Blake 2019-05-01 12:06 ` Eric Blake 2019-05-01 13:36 ` Thomas Huth 2019-05-01 13:36 ` Thomas Huth 2019-05-01 13:13 ` Thomas Huth 2019-05-01 13:13 ` Thomas Huth 2019-05-01 14:23 ` Alex Bennée 2019-05-01 14:23 ` Alex Bennée 2019-04-28 15:54 ` Thomas Huth [this message] 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary Thomas Huth 2019-05-01 8:27 ` Alex Bennée 2019-05-01 8:27 ` Alex Bennée 2019-05-01 15:18 ` Philippe Mathieu-Daudé 2019-05-01 15:18 ` Philippe Mathieu-Daudé 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 4/8] tests/qemu-iotests: Do not hard-code the path to bash Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-05-01 8:27 ` Alex Bennée 2019-05-01 8:27 ` Alex Bennée 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-04-30 21:54 ` Li-Wen Hsu 2019-04-30 21:54 ` Li-Wen Hsu 2019-05-01 11:09 ` Alex Bennée 2019-05-01 11:09 ` Alex Bennée 2019-05-01 15:19 ` Philippe Mathieu-Daudé 2019-05-01 15:19 ` Philippe Mathieu-Daudé 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 6/8] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-05-01 11:10 ` Alex Bennée 2019-05-01 11:10 ` Alex Bennée 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-05-01 16:37 ` Alex Bennée 2019-05-01 16:37 ` Alex Bennée 2019-05-02 5:44 ` Thomas Huth 2019-05-02 5:44 ` Thomas Huth 2019-04-28 15:54 ` [Qemu-devel] [PATCH v2 8/8] tests: Run the iotests during "make check" again Thomas Huth 2019-04-28 15:54 ` Thomas Huth 2019-04-28 16:10 ` [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check" no-reply 2019-04-28 16:10 ` no-reply 2019-04-29 5:25 ` Thomas Huth 2019-04-29 5:25 ` Thomas Huth 2019-04-29 3:47 ` no-reply 2019-04-29 3:47 ` no-reply 2019-04-29 5:30 ` Thomas Huth 2019-04-29 5:30 ` Thomas Huth 2019-05-01 8:30 ` Alex Bennée 2019-05-01 8:30 ` Alex Bennée 2019-05-01 10:04 ` Thomas Huth 2019-05-01 10:04 ` Thomas Huth 2019-05-01 8:30 ` Alex Bennée 2019-05-01 8:30 ` Alex Bennée
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=20190428155451.15653-4-thuth@redhat.com \ --to=thuth@redhat.com \ --cc=alex.bennee@linaro.org \ --cc=armbru@redhat.com \ --cc=cfergeau@redhat.com \ --cc=eblake@redhat.com \ --cc=emaste@freebsd.org \ --cc=fam@euphon.net \ --cc=kwolf@redhat.com \ --cc=lwhsu@freebsd.org \ --cc=mreitz@redhat.com \ --cc=philmd@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=wainersm@redhat.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.