From 5e41ecd75bc95d1390328218676c72ac1cf4562b Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 8 Jul 2019 15:25:54 +0100 Subject: [PATCH 08/39] qemu-iotests: Fix paths for NFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Pino Toscano Message-id: <20190708152601.21123-4-ptoscano@redhat.com> Patchwork-id: 89423 O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v3 03/10] qemu-iotests: Fix paths for NFS Bugzilla: 1513367 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Max Reitz RH-Acked-by: Miroslav Rezanina RH-Acked-by: Markus Armbruster From: Kevin Wolf Test cases were trying to use nfs:// URLs as local filenames, which made every test fail for NFS. With TEST_IMG and TEST_IMG_FILE set like for the other protocols, NFS tests can pass again. Signed-off-by: Kevin Wolf Reviewed-by: Fam Zheng (cherry picked from commit 655ae6bb91998a01964759406cb38ef215a6ba5b) Signed-off-by: Pino Toscano Signed-off-by: Danilo C. L. de Paula --- tests/qemu-iotests/common.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 9a65a11..cb5fa14 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -147,8 +147,8 @@ else TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE" elif [ "$IMGPROTO" = "nfs" ]; then - TEST_DIR="nfs://127.0.0.1/$TEST_DIR" - TEST_IMG=$TEST_DIR/t.$IMGFMT + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT + TEST_IMG="nfs://127.0.0.1$TEST_IMG_FILE" elif [ "$IMGPROTO" = "vxhs" ]; then TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT" -- 1.8.3.1