From: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com,
mimu@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH RFC v7 1/7] qemu-iotests: qemu machine type support
Date: Thu, 23 Apr 2015 10:42:12 +0800 [thread overview]
Message-ID: <1429756938-17186-2-git-send-email-chenxg@linux.vnet.ibm.com> (raw)
In-Reply-To: <1429756938-17186-1-git-send-email-chenxg@linux.vnet.ibm.com>
This patch adds qemu machine type support to the io test suite.
Based on the qemu default machine type and alias of the default machine type
the reference output file can now vary from the default to a machine specific
output file if necessary. When using a machine specific reference file if the
default machine has an alias then use the alias as the output file name
otherwise use the default machine name as the output file name.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Signed-off-by: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
---
tests/qemu-iotests/check | 5 +++++
tests/qemu-iotests/common.config | 9 +++++++++
tests/qemu-iotests/iotests.py | 1 +
3 files changed, 15 insertions(+)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index baeae80..22b2e63 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -324,6 +324,11 @@ do
fi
reference="$source_iotests/$seq.out"
+ reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out"
+ if [ -f "$reference_machine" ]; then
+ reference="$reference_machine"
+ fi
+
if [ "$CACHEMODE" = "none" ]; then
[ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache"
fi
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index a1973ad..0288cb1 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -107,6 +107,15 @@ export QEMU=$QEMU_PROG
export QEMU_IMG=$QEMU_IMG_PROG
export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
export QEMU_NBD=$QEMU_NBD_PROG
+default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}')
+default_alias_machine=$($QEMU -machine \? |\
+ awk -v var_default_machine="$default_machine"\)\
+ '{if ($(NF-2)=="(alias"&&$(NF-1)=="of"&&$(NF)==var_default_machine){print $1}}')
+if [ ! -z "$default_alias_machine" ]; then
+ default_machine="$default_alias_machine"
+fi
+
+export QEMU_DEFAULT_MACHINE="$default_machine"
[ -f /etc/qemu-iotest.config ] && . /etc/qemu-iotest.config
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 1402854..36917bd 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -42,6 +42,7 @@ imgproto = os.environ.get('IMGPROTO', 'file')
test_dir = os.environ.get('TEST_DIR', '/var/tmp')
output_dir = os.environ.get('OUTPUT_DIR', '.')
cachemode = os.environ.get('CACHEMODE')
+qemu_default_machine = os.environ.get('QEMU_DEFAULT_MACHINE')
socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
--
2.3.0
next prev parent reply other threads:[~2015-04-23 2:42 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-23 2:42 [Qemu-devel] [PATCH RFC v7 0/7] Update tests/qemu-iotests failing cases for the s390 platform Xiao Guang Chen
2015-04-23 2:42 ` Xiao Guang Chen [this message]
2015-04-23 2:42 ` [Qemu-devel] [PATCH RFC v7 2/7] qemu-iotests: run qemu with -nodefaults and fix 067, 071, 081 and 087 Xiao Guang Chen
2015-04-23 2:42 ` [Qemu-devel] [PATCH RFC v7 3/7] qemu-iotests: s390x: fix test 041 Xiao Guang Chen
2015-04-23 2:42 ` [Qemu-devel] [PATCH RFC v7 4/7] qemu-iotests: s390x: fix test 055 Xiao Guang Chen
2015-04-23 2:42 ` [Qemu-devel] [PATCH RFC v7 5/7] qemu-iotests: s390x: fix test 049 Xiao Guang Chen
2015-04-23 16:47 ` Max Reitz
2015-04-27 2:52 ` tu bo
2015-04-23 2:42 ` [Qemu-devel] [PATCH RFC v7 6/7] qemu-iotests: s390x: fix test 051 Xiao Guang Chen
2015-04-23 17:00 ` Max Reitz
2015-04-27 3:57 ` tu bo
2015-04-27 11:18 ` Max Reitz
2015-04-23 2:42 ` [Qemu-devel] [PATCH RFC v7 7/7] qemu-iotests-s390x-fix-test-130 Xiao Guang Chen
2015-04-23 17:07 ` Max Reitz
2015-04-27 7:15 ` tu bo
2015-04-27 11:24 ` Max Reitz
2015-04-27 11:34 ` Kevin Wolf
2015-04-28 2:59 ` tu bo
2015-04-28 8:23 ` Kevin Wolf
2015-05-04 6:30 ` tu bo
-- strict thread matches above, loose matches on Subject: below --
2015-04-23 2:05 [Qemu-devel] [PATCH RFC v7 0/7] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
2015-04-23 2:05 ` [Qemu-devel] [PATCH RFC v7 1/7] qemu-iotests: qemu machine type support Bo Tu
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=1429756938-17186-2-git-send-email-chenxg@linux.vnet.ibm.com \
--to=chenxg@linux.vnet.ibm.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mimu@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--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 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.