[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 18/18] qemu-iotests: test 026 store blkdebug.cfg l
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv2 18/18] qemu-iotests: test 026 store blkdebug.cfg locally |
Date: |
Sun, 5 Jan 2014 18:22:08 +0100 |
Signed-off-by: Peter Lieven <address@hidden>
---
tests/qemu-iotests/026 | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index df2884b..fe268e4 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -28,10 +28,16 @@ here=`pwd`
tmp=/tmp/$$
status=1 # failure is the default!
+BLKDEBUG_CONFIGDIR=`pwd`/scratch
+if [ ! -e "$BLKDEBUG_CONFIGDIR" ]; then
+ mkdir "BLKDEBUG_CONFIGDIR"
+fi
+BLKDBG_CONFIGFILE=$BLKDEBUG_CONFIGDIR/blkdebug.conf
+
_cleanup()
{
- _cleanup_test_img
- rm "$TEST_DIR/blkdebug.conf"
+ _cleanup_test_img
+ rm "$BLKDBG_CONFIGFILE"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -42,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Currently only qcow2 supports rebasing
_supported_fmt qcow2
-_supported_proto file
+_supported_proto generic
_supported_os Linux
_default_cache_mode "writethrough"
_supported_cache_modes "writethrough" "none"
@@ -52,7 +58,7 @@ echo
CLUSTER_SIZE=1024
-BLKDBG_TEST_IMG="blkdebug:$TEST_DIR/blkdebug.conf:$TEST_IMG"
+BLKDBG_TEST_IMG="blkdebug:$BLKDBG_CONFIGFILE:$TEST_IMG"
for event in \
l1_update \
@@ -76,7 +82,7 @@ for imm in off; do
for once in on off; do
for vmstate in "" "-b"; do
-cat > "$TEST_DIR/blkdebug.conf" <<EOF
+cat > "$BLKDBG_CONFIGFILE" <<EOF
[inject-error]
event = "$event"
errno = "$errno"
@@ -134,7 +140,7 @@ for imm in off; do
for once in on off; do
for vmstate in "" "-b"; do
-cat > "$TEST_DIR/blkdebug.conf" <<EOF
+cat > "$BLKDBG_CONFIGFILE" <<EOF
[inject-error]
event = "$event"
errno = "$errno"
@@ -173,7 +179,7 @@ for errno in 5 28; do
for imm in off; do
for once in on off; do
-cat > "$TEST_DIR/blkdebug.conf" <<EOF
+cat > "$BLKDBG_CONFIGFILE" <<EOF
[inject-error]
event = "$event"
errno = "$errno"
--
1.7.9.5
- Re: [Qemu-devel] [PATCHv2 06/18] qemu-iotests: fix test 018 to work with any protocol, (continued)
- [Qemu-devel] [PATCHv2 10/18] qemu-iotests: fix test 028 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 09/18] qemu-iotests: fix test 024 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 11/18] qemu-iotests: fix test 034 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 13/18] qemu-iotests: fix test 038 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 07/18] qemu-iotests: fix test 019 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 08/18] qemu-iotests: fix test 020 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 12/18] qemu-iotests: fix test 037 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 14/18] qemu-iotests: fix test 043 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 16/18] qemu-iotests: fix expected output of test 067, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 18/18] qemu-iotests: test 026 store blkdebug.cfg locally,
Peter Lieven <=
- [Qemu-devel] [PATCHv2 15/18] qemu-iotests: fix test 046 to work with any protocol, Peter Lieven, 2014/01/05
- [Qemu-devel] [PATCHv2 17/18] qemu-iotests: blacklist test 020 for NFS protocol, Peter Lieven, 2014/01/05