Received: from eggs.gnu.org ([209.51.188.92]:39998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEK4q-0003AK-48 for qemu-devel@nongnu.org; Wed, 10 Apr 2019 16:44:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEK4o-0000QN-De for qemu-devel@nongnu.org; Wed, 10 Apr 2019 16:44:11 -0400 From: Eric Blake Date: Wed, 10 Apr 2019 15:42:17 -0500 Message-Id: <20190410204215.5963-1-eblake@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-4.0?] iotest: Fix 241 to run in generic directory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: vsementsov@virtuozzo.com, qemu-block@nongnu.org, mreitz@redhat.com, John Snow , Kevin Wolf Filter the qemu-nbd server output to get rid of a direct reference to my build directory. Fixes: e9dce9cb Reported-by: Max Reitz Signed-off-by: Eric Blake --- Not worth -rc4 on its own, but if something else pops up that requires another spin, I plan on a pull request for this one. Otherwise it slips to 4.1, and 4.0 just has a broken iotest. tests/qemu-iotests/241 | 4 +++- tests/qemu-iotests/241.out | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241 index 4b196857387..017a736aaba 100755 --- a/tests/qemu-iotests/241 +++ b/tests/qemu-iotests/241 @@ -28,6 +28,7 @@ nbd_unix_socket=3D$TEST_DIR/test_qemu_nbd_socket _cleanup() { _cleanup_test_img + rm -f "$TEST_DIR/server.log" nbd_server_stop } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -69,12 +70,13 @@ echo # Intentionally omit '-f' to force image probing, which in turn forces # sector alignment, here at the server. -nbd_server_start_unix_socket "$TEST_IMG_FILE" +nbd_server_start_unix_socket "$TEST_IMG_FILE" 2> "$TEST_DIR/server.log" $QEMU_NBD_PROG --list -k $nbd_unix_socket | grep '\(size\|min\)' $QEMU_IMG map -f raw --output=3Djson "$TEST_IMG" | _filter_qemu_img_map $QEMU_IO -f raw -c map "$TEST_IMG" nbd_server_stop +cat "$TEST_DIR/server.log" | _filter_testdir echo echo "=3D=3D=3D Exporting unaligned raw image, forced client sector alig= nment =3D=3D=3D" diff --git a/tests/qemu-iotests/241.out b/tests/qemu-iotests/241.out index f481074a02e..75f9f465e52 100644 --- a/tests/qemu-iotests/241.out +++ b/tests/qemu-iotests/241.out @@ -10,13 +10,13 @@ QA output created by 241 =3D=3D=3D Exporting unaligned raw image, forced server sector alignment = =3D=3D=3D -WARNING: Image format was not specified for '/home/eblake/qemu/tests/qem= u-iotests/scratch/t.raw' and probing guessed raw. - Automatically detecting the format is dangerous for raw images,= write operations on block 0 will be restricted. - Specify the 'raw' format explicitly to remove the restrictions. size: 1024 min block: 512 [{ "start": 0, "length": 1024, "depth": 0, "zero": false, "data": true, = "offset": OFFSET}] 1 KiB (0x400) bytes allocated at offset 0 bytes (0x0) +WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing= guessed raw. + Automatically detecting the format is dangerous for raw images,= write operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. =3D=3D=3D Exporting unaligned raw image, forced client sector alignment = =3D=3D=3D --=20 2.20.1