From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54325)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pl@kamp.de>)
	id 1VzrST-0003mK-Q5
	for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:25:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pl@kamp.de>) id 1VzrSM-0003Of-JN
	for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:25:53 -0500
Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:34991 helo=mx01.kamp.de)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pl@kamp.de>)
	id 1VzrSM-0003OY-43
	for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:25:46 -0500
From: Peter Lieven <pl@kamp.de>
Date: Sun,  5 Jan 2014 18:22:08 +0100
Message-Id: <1388942528-10453-19-git-send-email-pl@kamp.de>
In-Reply-To: <1388942528-10453-1-git-send-email-pl@kamp.de>
References: <1388942528-10453-1-git-send-email-pl@kamp.de>
Subject: [Qemu-devel] [PATCHv2 18/18] qemu-iotests: test 026 store
	blkdebug.cfg locally
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>, ronniesahlberg@gmail.com, Jeff Cody <jcody@redhat.com>, Peter Lieven <pl@kamp.de>, Max Reitz <mreitz@redhat.com>, owasserm@redhat.com, Federico Simoncelli <fsimonce@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Wenchao Xia <xiawenc@linux.vnet.ibm.com>

Signed-off-by: Peter Lieven <pl@kamp.de>
---
 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