[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v8 1/7] qemu-iotests: qemu machine type support
From: |
Bo Tu |
Subject: |
[Qemu-devel] [PATCH RFC v8 1/7] qemu-iotests: qemu machine type support |
Date: |
Thu, 7 May 2015 15:52:17 +0800 |
From: Xiao Guang Chen <address@hidden>
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 <address@hidden>
Reviewed-by: Michael Mueller <address@hidden>
Signed-off-by: Xiao Guang Chen <address@hidden>
---
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 e93e623..6a670c6 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
- [Qemu-devel] [PATCH RFC v8 0/7] Update tests/qemu-iotests failing cases for the s390 platform, Bo Tu, 2015/05/07
- [Qemu-devel] [PATCH RFC v8 1/7] qemu-iotests: qemu machine type support,
Bo Tu <=
- [Qemu-devel] [PATCH RFC v8 3/7] qemu-iotests: s390x: fix test 041, Bo Tu, 2015/05/07
- [Qemu-devel] [PATCH RFC v8 5/7] qemu-iotests: s390x: fix test 049, Bo Tu, 2015/05/07
- [Qemu-devel] [PATCH RFC v8 4/7] qemu-iotests: s390x: fix test 055, Bo Tu, 2015/05/07
- [Qemu-devel] [PATCH RFC v8 7/7] qemu-iotests: s390x: fix test 130, Bo Tu, 2015/05/07
- [Qemu-devel] [PATCH RFC v8 2/7] qemu-iotests: run qemu with -nodefaults and fix 067, 071, 081 and 087, Bo Tu, 2015/05/07
- [Qemu-devel] [PATCH RFC v8 6/7] qemu-iotests: s390x: fix test 051, Bo Tu, 2015/05/07