[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/30] iotests: Fix IMGOPTSSYNTAX for nbd
From: |
Kevin Wolf |
Subject: |
[PULL 16/30] iotests: Fix IMGOPTSSYNTAX for nbd |
Date: |
Thu, 19 Dec 2019 18:24:27 +0100 |
From: Max Reitz <address@hidden>
There is no $SOCKDIR, only $SOCK_DIR.
Fixes: f3923a72f199b2c63747a7032db74730546f55c6
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/common.rc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 6f0582c79a..555c453911 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -217,7 +217,8 @@ if [ "$IMGOPTSSYNTAX" = "true" ]; then
TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
elif [ "$IMGPROTO" = "nbd" ]; then
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
-
TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix,file.path=$SOCKDIR/nbd"
+ TEST_IMG="$DRIVER,file.driver=nbd,file.type=unix"
+ TEST_IMG="$TEST_IMG,file.path=$SOCK_DIR/nbd"
elif [ "$IMGPROTO" = "ssh" ]; then
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
--
2.20.1
- [PULL 08/30] qcow2: Declare BDRV_REQ_NO_FALLBACK supported, (continued)
- [PULL 08/30] qcow2: Declare BDRV_REQ_NO_FALLBACK supported, Kevin Wolf, 2019/12/19
- [PULL 07/30] blockjob: Fix error message for negative speed, Kevin Wolf, 2019/12/19
- [PULL 09/30] iotests: Add qemu_io_log(), Kevin Wolf, 2019/12/19
- [PULL 10/30] iotests: Fix timeout in run_job(), Kevin Wolf, 2019/12/19
- [PULL 11/30] iotests: Support job-complete in run_job(), Kevin Wolf, 2019/12/19
- [PULL 12/30] qcow2: Use offset_into_cluster(), Kevin Wolf, 2019/12/19
- [PULL 14/30] iotests: Add more "_require_drivers" checks to the shell-based tests, Kevin Wolf, 2019/12/19
- [PULL 13/30] MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header, Kevin Wolf, 2019/12/19
- [PULL 17/30] qcow2: Move error check of local_err near its assignment, Kevin Wolf, 2019/12/19
- [PULL 15/30] iotests/273: Filter format-specific information, Kevin Wolf, 2019/12/19
- [PULL 16/30] iotests: Fix IMGOPTSSYNTAX for nbd,
Kevin Wolf <=
- [PULL 18/30] iotests: Create VM.blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 19/30] iotests: 255: Drop blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 20/30] iotests: 206: Convert to VM.blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 21/30] iotests: 210: Convert to VM.blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 22/30] iotests: 212: Convert to VM.blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 23/30] iotests: 213: Convert to VM.blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 28/30] block: Activate recursively even for already active nodes, Kevin Wolf, 2019/12/19
- [PULL 30/30] iotests: Test external snapshot with VM state, Kevin Wolf, 2019/12/19
- [PULL 24/30] iotests: 237: Convert to VM.blockdev_create(), Kevin Wolf, 2019/12/19
- [PULL 27/30] iotests: 211: Remove duplication with VM.blockdev_create(), Kevin Wolf, 2019/12/19