iotests: fix _check_o_direct
PATCH 1/1 iotests: fix _check_o_direct
Unfortunately commit "iotests: handle tmpfs" break running iotests with -nbd -nocache, as _check_o_direct tries to create $TEST_IMG.test_o_direct, but in case of nbd TEST_IMG is smothing like nbd+unix:///... , and test fails with message
qemu-img: nbd+unix:///?socket[...]test_o_direct: Protocol driver
'nbd' does not support image creation, and opening the image
failed: Failed to connect to '/tmp/tmp.[...]/nbd/test_o_direct': No such file or directory
Use TEST_DIR instead.
--- tests/qemu-iotests/common.rc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tests/qemu-iotests/common.rc +4 -3
@@ -821,9 +821,10 @@ _supported_cache_modes() # Check whether the filesystem supports O_DIRECT _check_o_direct() { - $QEMU_IMG create -f raw "$TEST_IMG".test_o_direct 1M > /dev/null - out=$($QEMU_IO -f raw -t none -c quit "$TEST_IMG".test_o_direct 2>&1) - rm -f "$TEST_IMG".test_o_direct + testfile="$TEST_DIR"/_check_o_direct + $QEMU_IMG create -f raw "$testfile" 1M > /dev/null + out=$($QEMU_IO -f raw -t none -c quit "$testfile" 2>&1) + rm -f "$testfile" [[ "$out" != *"O_DIRECT"* ]] }
Signature · 1 line
2.25.4
Max Reitz
AppliedQuoted 10 lines · Vladimir Sementsov-Ogievskiy
Unfortunately commit "iotests: handle tmpfs" break running iotests with -nbd -nocache, as
_check_o_directtries to create $TEST_IMG.test_o_direct, but in case of nbdTEST_IMGis smothing like nbd+unix:///... , and test fails with messageqemu-img: nbd+unix:///?socket[...]test_o_direct: Protocol driver
'nbd' does not support image creation, and opening the image
failed: Failed to connect to '/tmp/tmp.[...]/nbd/test_o_direct': No such file or directory
Quoted 7 lines
Use
TEST_DIRinstead.Fixes cfdca2b9f9d4ca26bb2b2dfe8de3149092e39170Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/common.rc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Thanks, applied to my block branch:
Quoted 4 lines · Max Reitz
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
Unfortunately commit "iotests: handle tmpfs" break running iotests with -nbd -nocache, as
_check_o_directtries to create $TEST_IMG.test_o_direct, but in case of nbdTEST_IMGis smothing like
s/smothing/something/ , sorry.
Quoted 15 lines
Quoted 7 lines
nbd+unix:///... , and test fails with message
qemu-img: nbd+unix:///?socket[...]test_o_direct: Protocol driver 'nbd' does not support image creation, and opening the image
failed: Failed to connect to '/tmp/tmp.[...]/nbd/test_o_direct': No such file or directoryQuoted 7 lines
Use
TEST_DIRinstead.Fixes cfdca2b9f9d4ca26bb2b2dfe8de3149092e39170Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
tests/qemu-iotests/common.rc | 7 ++++---1 file changed, 4 insertions(+), 3 deletions(-)
Quoted 4 lines
Thanks, applied to my block branch:
Thanks!
Signature · 2 lines
Best regards, Vladimir
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
Quoted 4 lines · Max Reitz
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
Unfortunately commit "iotests: handle tmpfs" break running iotests with -nbd -nocache, as
_check_o_directtries to create $TEST_IMG.test_o_direct, but in case of nbdTEST_IMGis smothing likes/smothing/something/ , sorry.
Already done O:)