diff options
| author | Max Reitz <mreitz@redhat.com> | 2018-07-13 21:41:00 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-07-23 16:50:43 +0200 |
| commit | d6e4ca902148f33cfaf117396f57c7fff7c635f0 (patch) | |
| tree | 27e61080b7c15775c3618d7f0982e5fb1d239306 /tests/qemu-iotests | |
| parent | e05eb9f29b762cd33d38b712c8c26a432dacf45c (diff) | |
| download | qemu-d6e4ca902148f33cfaf117396f57c7fff7c635f0.zip qemu-d6e4ca902148f33cfaf117396f57c7fff7c635f0.tar.gz qemu-d6e4ca902148f33cfaf117396f57c7fff7c635f0.tar.bz2 | |
iotest: Fix filtering order in 226
The test directory should be filtered before the image format, otherwise
the test will fail if the image format is part of the test directory,
like so:
[...]
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+can't open: Could not open '/tmp/test-IMGFMT/t.IMGFMT': Is a directory
[...]
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/226 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/226 b/tests/qemu-iotests/226 index 34987d4..211ea98 100755 --- a/tests/qemu-iotests/226 +++ b/tests/qemu-iotests/226 @@ -55,10 +55,10 @@ for PROTO in "file" "host_device" "host_cdrom"; do echo "=== Testing with driver:$PROTO ===" echo echo "== Testing RO ==" - $QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir + $QEMU_IO -c "open -r -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt $QEMU_IO -c "open -r -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt echo "== Testing RW ==" - $QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_imgfmt | _filter_testdir + $QEMU_IO -c "open -o driver=$PROTO,filename=$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt $QEMU_IO -c "open -o driver=$PROTO,filename=/dev/null" 2>&1 | _filter_imgfmt done |