[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/16] qemu-iotests: qemu machine type support
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 01/16] qemu-iotests: qemu machine type support |
Date: |
Fri, 4 Sep 2015 22:10:32 +0200 |
From: Bo Tu <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>
Reviewed-by: Sascha Silbe <address@hidden>
Signed-off-by: Xiao Guang Chen <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/check | 5 +++++
tests/qemu-iotests/common.config | 11 ++++++++++-
tests/qemu-iotests/iotests.py | 1 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 1fa6319..6d58203 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -330,6 +330,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..e0bf896 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -103,10 +103,19 @@ if [ -z "$QEMU_NBD_PROG" ]; then
export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
fi
-export QEMU=$QEMU_PROG
+export QEMU="$QEMU_PROG $QEMU_OPTIONS"
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 8615b10..5579253 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')
--
1.8.3.1
- [Qemu-devel] [PULL 00/16] Block patches, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 01/16] qemu-iotests: qemu machine type support,
Kevin Wolf <=
- [Qemu-devel] [PULL 03/16] qemu-iotests: s390x: fix test 041 and 055, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 04/16] qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 02/16] qemu-iotests: disable default qemu devices for cross-platform compatibility, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 05/16] qemu-iotests: s390x: fix test 130, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 07/16] qemu-img: Fix crash in amend invocation, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 06/16] block/raw-posix: Use raw_normalize_devicepath(), Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 08/16] iotests: More options for VM.add_drive(), Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 09/16] iotests: Respect -nodefaults in tests 41 and 55, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 10/16] iotests: Do not suppress segfaults in bash tests, Kevin Wolf, 2015/09/04
- [Qemu-devel] [PULL 11/16] iotests: Warn if python subprocess is killed, Kevin Wolf, 2015/09/04