From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH 20/23] iotests/223: Create socket in $SOCK_DIR
Date: Thu, 10 Oct 2019 17:24:54 +0200 [thread overview]
Message-ID: <20191010152457.17713-21-mreitz@redhat.com> (raw)
In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/223 | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223
index 2ba3d8124b..b5a80e50bb 100755
--- a/tests/qemu-iotests/223
+++ b/tests/qemu-iotests/223
@@ -28,7 +28,7 @@ _cleanup()
nbd_server_stop
_cleanup_test_img
_cleanup_qemu
- rm -f "$TEST_DIR/nbd"
+ rm -f "$SOCK_DIR/nbd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -125,11 +125,11 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
"arguments":{"device":"n"}}' "error" # Attempt add without server
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",
"arguments":{"addr":{"type":"unix",
- "data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return"
+ "data":{"path":"'"$SOCK_DIR/nbd"'"}}}}' "return"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",
"arguments":{"addr":{"type":"unix",
- "data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second server
-$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"
+ "data":{"path":"'"$SOCK_DIR/nbd"1'"}}}}' "error" # Attempt second server
+$QEMU_NBD_PROG -L -k "$SOCK_DIR/nbd"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
"arguments":{"device":"n", "bitmap":"b"}}' "return"
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
@@ -145,14 +145,14 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
"arguments":{"device":"n", "name":"n2", "writable":true,
"bitmap":"b2"}}' "return"
-$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"
+$QEMU_NBD_PROG -L -k "$SOCK_DIR/nbd"
echo
echo "=== Contrast normal status to large granularity dirty-bitmap ==="
echo
QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT
-IMG="driver=nbd,export=n,server.type=unix,server.path=$TEST_DIR/nbd"
+IMG="driver=nbd,export=n,server.type=unix,server.path=$SOCK_DIR/nbd"
$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m 1m' \
-c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io
$QEMU_IMG map --output=json --image-opts \
@@ -164,7 +164,7 @@ echo
echo "=== Contrast to small granularity dirty-bitmap ==="
echo
-IMG="driver=nbd,export=n2,server.type=unix,server.path=$TEST_DIR/nbd"
+IMG="driver=nbd,export=n2,server.type=unix,server.path=$SOCK_DIR/nbd"
$QEMU_IMG map --output=json --image-opts \
"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map
--
2.21.0
next prev parent reply other threads:[~2019-10-10 15:36 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 15:24 [PATCH 00/23] iotests: Add and use $SOCK_DIR Max Reitz
2019-10-10 15:24 ` [PATCH 01/23] iotests: Introduce $SOCK_DIR Max Reitz
2019-10-10 18:18 ` Eric Blake
2019-10-11 7:51 ` Max Reitz
2019-10-10 15:24 ` [PATCH 02/23] iotests.py: Store socket files in $SOCK_DIR Max Reitz
2019-10-10 18:36 ` Eric Blake
2019-10-11 7:21 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 03/23] iotests.py: Add @base_dir to FilePaths etc Max Reitz
2019-10-10 18:40 ` Eric Blake
2019-10-10 15:24 ` [PATCH 04/23] iotests: Filter $SOCK_DIR Max Reitz
2019-10-10 18:42 ` Eric Blake
2019-10-11 7:54 ` Max Reitz
2019-10-11 7:57 ` Thomas Huth
2019-10-10 19:50 ` Eric Blake
2019-10-11 7:57 ` Max Reitz
2019-10-10 15:24 ` [PATCH 05/23] iotests: Let common.nbd create socket in $SOCK_DIR Max Reitz
2019-10-10 18:59 ` Eric Blake
2019-10-10 15:24 ` [PATCH 06/23] iotests/083: Create " Max Reitz
2019-10-10 19:03 ` Eric Blake
2019-10-11 7:31 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 07/23] iotests/140: " Max Reitz
2019-10-10 19:05 ` Eric Blake
2019-10-11 7:34 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 08/23] iotests/143: " Max Reitz
2019-10-10 19:23 ` Eric Blake
2019-10-11 7:35 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 09/23] iotests/147: " Max Reitz
2019-10-10 19:23 ` Eric Blake
2019-10-11 7:36 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 10/23] iotests/181: " Max Reitz
2019-10-10 19:24 ` Eric Blake
2019-10-11 7:38 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 11/23] iotests/182: " Max Reitz
2019-10-10 19:24 ` Eric Blake
2019-10-11 7:38 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 12/23] iotests/183: " Max Reitz
2019-10-10 19:28 ` Eric Blake
2019-10-11 7:42 ` Thomas Huth
2019-10-10 15:24 ` [PATCH 13/23] iotests/192: " Max Reitz
2019-10-10 19:28 ` Eric Blake
2019-10-10 15:24 ` [PATCH 14/23] iotests/194: Create sockets " Max Reitz
2019-10-10 19:32 ` Eric Blake
2019-10-10 19:43 ` Eric Blake
2019-10-11 7:55 ` Max Reitz
2019-10-10 15:24 ` [PATCH 15/23] iotests/201: Create socket " Max Reitz
2019-10-10 19:39 ` Eric Blake
2019-10-10 15:24 ` [PATCH 16/23] iotests/205: " Max Reitz
2019-10-10 19:40 ` Eric Blake
2019-10-10 15:24 ` [PATCH 17/23] iotests/208: " Max Reitz
2019-10-10 19:41 ` Eric Blake
2019-10-10 15:24 ` [PATCH 18/23] iotests/209: " Max Reitz
2019-10-10 19:44 ` Eric Blake
2019-10-10 15:24 ` [PATCH 19/23] iotests/222: " Max Reitz
2019-10-10 19:45 ` Eric Blake
2019-10-10 15:24 ` Max Reitz [this message]
2019-10-10 19:46 ` [PATCH 20/23] iotests/223: " Eric Blake
2019-10-10 15:24 ` [PATCH 21/23] iotests/240: " Max Reitz
2019-10-10 19:46 ` Eric Blake
2019-10-10 15:24 ` [PATCH 22/23] iotests/267: " Max Reitz
2019-10-10 19:47 ` Eric Blake
2019-10-10 15:24 ` [PATCH 23/23] iotests: Drop TEST_DIR filter from _filter_nbd Max Reitz
2019-10-10 19:51 ` Eric Blake
2019-10-11 7:27 ` [PATCH 00/23] iotests: Add and use $SOCK_DIR Thomas Huth
2019-10-11 8:03 ` Max Reitz
2019-10-11 8:13 ` Thomas Huth
2019-10-11 8:54 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191010152457.17713-21-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).