summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests/241
diff options
context:
space:
mode:
authorEric Blake2019-04-10 22:42:17 +0200
committerKevin Wolf2019-04-12 18:03:01 +0200
commit9749636b005d118259810afb92482df2fe0ae2ad (patch)
tree141bdcb90e1cefa32e6e299051774961b9bb7f15 /tests/qemu-iotests/241
parentiotests: Let 245 pass on tmpfs (diff)
downloadqemu-9749636b005d118259810afb92482df2fe0ae2ad.tar.gz
qemu-9749636b005d118259810afb92482df2fe0ae2ad.tar.xz
qemu-9749636b005d118259810afb92482df2fe0ae2ad.zip
iotest: Fix 241 to run in generic directory
Filter the qemu-nbd server output to get rid of a direct reference to my build directory. Fixes: e9dce9cb Reported-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/241')
-rwxr-xr-xtests/qemu-iotests/2414
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 4b19685738..017a736aab 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241
@@ -28,6 +28,7 @@ nbd_unix_socket=$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=json "$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 "=== Exporting unaligned raw image, forced client sector alignment ==="