[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/69] iotests/267: Create socket in $SOCK_DIR
From: |
Max Reitz |
Subject: |
[PULL 34/69] iotests/267: Create socket in $SOCK_DIR |
Date: |
Mon, 28 Oct 2019 13:14:26 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/267 | 4 ++--
tests/qemu-iotests/267.out | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index d37a67c012..170e173c0a 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_DIR/nbd"
+ rm -f "$SOCK_DIR/nbd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -143,7 +143,7 @@ echo
IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
cat <<EOF |
-nbd_server_start unix:$TEST_DIR/nbd
+nbd_server_start unix:$SOCK_DIR/nbd
nbd_server_add -w backing-fmt
savevm snap0
info snapshots
diff --git a/tests/qemu-iotests/267.out b/tests/qemu-iotests/267.out
index 9d812e3c72..8dddb4baa4 100644
--- a/tests/qemu-iotests/267.out
+++ b/tests/qemu-iotests/267.out
@@ -161,7 +161,7 @@ Internal snapshots on backing file:
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
backing_file=TEST_DIR/t.IMGFMT.base
Testing: -blockdev
driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev
driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev
driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev
driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) nbd_server_start unix:TEST_DIR/nbd
+(qemu) nbd_server_start unix:SOCK_DIR/nbd
(qemu) nbd_server_add -w backing-fmt
(qemu) savevm snap0
(qemu) info snapshots
--
2.21.0
- [PULL 25/69] iotests/192: Create socket in $SOCK_DIR, (continued)
- [PULL 25/69] iotests/192: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 24/69] iotests/183: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 26/69] iotests/194: Create sockets in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 28/69] iotests/205: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 27/69] iotests/201: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 29/69] iotests/208: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 30/69] iotests/209: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 32/69] iotests/223: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 31/69] iotests/222: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 33/69] iotests/240: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 34/69] iotests/267: Create socket in $SOCK_DIR,
Max Reitz <=
- [PULL 36/69] block/block-copy: allocate buffer in block_copy_with_bounce_buffer, Max Reitz, 2019/10/28
- [PULL 35/69] iotests: Drop TEST_DIR filter from _filter_nbd, Max Reitz, 2019/10/28
- [PULL 37/69] block/block-copy: limit copy_range_size to 16 MiB, Max Reitz, 2019/10/28
- [PULL 40/69] block/block-copy: add memory limit, Max Reitz, 2019/10/28
- [PULL 38/69] block/block-copy: refactor copying, Max Reitz, 2019/10/28
- [PULL 39/69] util: introduce SharedResource, Max Reitz, 2019/10/28
- [PULL 41/69] block/block-copy: increase buffered copy request, Max Reitz, 2019/10/28
- [PULL 43/69] block/nvme: add support for discard, Max Reitz, 2019/10/28
- [PULL 42/69] block/nvme: add support for write zeros, Max Reitz, 2019/10/28
- [PULL 44/69] mirror: Do not dereference invalid pointers, Max Reitz, 2019/10/28