[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 22/23] iotests/267: Create socket in $SOCK_DIR
From: |
Max Reitz |
Subject: |
[PATCH v2 22/23] iotests/267: Create socket in $SOCK_DIR |
Date: |
Thu, 17 Oct 2019 15:31:54 +0200 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <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
- Re: [PATCH v2 16/23] iotests/205: Create socket in $SOCK_DIR, (continued)
- [PATCH v2 12/23] iotests/183: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 11/23] iotests/182: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 15/23] iotests/201: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 17/23] iotests/208: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 21/23] iotests/240: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 18/23] iotests/209: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 19/23] iotests/222: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 22/23] iotests/267: Create socket in $SOCK_DIR,
Max Reitz <=
- [PATCH v2 20/23] iotests/223: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 23/23] iotests: Drop TEST_DIR filter from _filter_nbd, Max Reitz, 2019/10/17
- Re: [PATCH v2 00/23] iotests: Add and use $SOCK_DIR, Eric Blake, 2019/10/17
- Re: [PATCH v2 00/23] iotests: Add and use $SOCK_DIR, Max Reitz, 2019/10/18