The default cache mode for drive options is changed to writethrough, and overridable with "./check -c <mode>".
Signed-off-by: Fam Zheng <f...@redhat.com> --- tests/qemu-iotests/common | 13 ++++++++++++- tests/qemu-iotests/iotests.py | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 2932e14..f870c52 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -42,12 +42,14 @@ expunge=true have_test_arg=false randomize=false valgrind=false +cachemode=false rm -f $tmp.list $tmp.tmp $tmp.sed export IMGFMT=raw export IMGFMT_GENERIC=true export IMGPROTO=file export IMGOPTS="" +export CACHEMODE="writethrough" export QEMU_IO_OPTIONS="" for r @@ -113,7 +115,11 @@ s/ .*//p IMGOPTS="$r" imgopts=false continue - + elif $cachemode + then + CACHEMODE="$r" + cachemode=false + continue fi xpand=true @@ -147,6 +153,7 @@ check options -o options -o options to pass to qemu-img create/convert -T output timestamps -r randomize test order + -c cache mode testlist options -g group[,group...] include tests from these groups @@ -259,6 +266,10 @@ testlist options imgopts=true xpand=false ;; + -c) + cachemode=true + xpand=false + ;; -r) # randomize test order randomize=true xpand=false diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index fb10ff4..c84a1a5 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -37,6 +37,7 @@ qemu_args = os.environ.get('QEMU', 'qemu').strip().split(' ') imgfmt = os.environ.get('IMGFMT', 'raw') imgproto = os.environ.get('IMGPROTO', 'file') test_dir = os.environ.get('TEST_DIR', '/var/tmp') +cachemode = os.environ.get('CACHEMODE') socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') @@ -96,7 +97,7 @@ class VM(object): '''Add a virtio-blk drive to the VM''' options = ['if=virtio', 'format=%s' % imgfmt, - 'cache=none', + 'cache=%s' % cachemode, 'file=%s' % path, 'id=drive%d' % self._num_drives] if opts: -- 1.8.4.2