From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI62-0001Z8-6p for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:23:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyI5y-0001xe-QN for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:23:10 -0500 From: Kevin Wolf Date: Mon, 25 Feb 2019 16:20:43 +0100 Message-Id: <20190225152053.15976-62-kwolf@redhat.com> In-Reply-To: <20190225152053.15976-1-kwolf@redhat.com> References: <20190225152053.15976-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 61/71] iotests: Fix 232 for LUKS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org From: Max Reitz With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests the file-posix protocol driver). Therefore, if $TEST_IMG_FILE is set, use that instead. Because this test requires the file protocol, $TEST_IMG_FILE will always be set if $IMGOPTSSYNTAX is true. Signed-off-by: Max Reitz Reviewed-by: John Snow Message-id: 20190210145736.1486-5-mreitz@redhat.com Signed-off-by: Max Reitz --- tests/qemu-iotests/232 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232 index 93e5d641a3..e48bc8f5db 100755 --- a/tests/qemu-iotests/232 +++ b/tests/qemu-iotests/232 @@ -69,6 +69,10 @@ size=3D128M =20 _make_test_img $size =20 +if [ -n "$TEST_IMG_FILE" ]; then + TEST_IMG=3D$TEST_IMG_FILE +fi + echo echo "=3D=3D=3D -drive with read-write image: read-only/auto-read-only c= ombinations =3D=3D=3D" echo --=20 2.20.1