diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-10-17 15:31:37 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-10-28 11:22:31 +0100 |
| commit | 5759322ab0414d277e6f340b2487f37d0f1f3c1e (patch) | |
| tree | 4df3cbe51cda5776f3997a57584a2b72d0c58515 | |
| parent | dc48bfdf9f38d0a3efeb681161a7636f65dcc652 (diff) | |
| download | qemu-5759322ab0414d277e6f340b2487f37d0f1f3c1e.zip qemu-5759322ab0414d277e6f340b2487f37d0f1f3c1e.tar.gz qemu-5759322ab0414d277e6f340b2487f37d0f1f3c1e.tar.bz2 | |
iotests: Let common.nbd create socket in $SOCK_DIR
In addition, drop the nbd_unix_socket assignment in 241 because it does
not really do anything.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20191017133155.5327-6-mreitz@redhat.com
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/241 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.nbd | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241 index 58b64eb..8dae8d3 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 24b01b6..a8cae8f 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" |