[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/23] iotests: Let common.nbd create socket in $SOCK_DIR
From: |
Max Reitz |
Subject: |
[PATCH v2 05/23] iotests: Let common.nbd create socket in $SOCK_DIR |
Date: |
Thu, 17 Oct 2019 15:31:37 +0200 |
In addition, drop the nbd_unix_socket assignment in 241 because it does
not really do anything.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/241 | 2 --
tests/qemu-iotests/common.nbd | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 58b64ebf41..8dae8d39e4 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241
@@ -23,8 +23,6 @@ echo "QA output created by $seq"
status=1 # failure is the default!
-nbd_unix_socket=$TEST_DIR/test_qemu_nbd_socket
-
_cleanup()
{
_cleanup_test_img
diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd
index 24b01b60aa..a8cae8fe2c 100644
--- a/tests/qemu-iotests/common.nbd
+++ b/tests/qemu-iotests/common.nbd
@@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-nbd_unix_socket="${TEST_DIR}/qemu-nbd.sock"
+nbd_unix_socket="${SOCK_DIR}/qemu-nbd.sock"
nbd_tcp_addr="127.0.0.1"
nbd_pid_file="${TEST_DIR}/qemu-nbd.pid"
nbd_stderr_fifo="${TEST_DIR}/qemu-nbd.fifo"
--
2.21.0
- [PATCH v2 00/23] iotests: Add and use $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 02/23] iotests.py: Store socket files in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 03/23] iotests.py: Add @base_dir to FilePaths etc., Max Reitz, 2019/10/17
- [PATCH v2 05/23] iotests: Let common.nbd create socket in $SOCK_DIR,
Max Reitz <=
- [PATCH v2 04/23] iotests: Filter $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 06/23] iotests/083: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 07/23] iotests/140: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 08/23] iotests/143: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 09/23] iotests/147: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 10/23] iotests/181: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 13/23] iotests/192: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17