[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/22] iotests: Make 091 work with data_file
From: |
Max Reitz |
Subject: |
[PATCH v3 17/22] iotests: Make 091 work with data_file |
Date: |
Thu, 7 Nov 2019 17:37:03 +0100 |
The image end offset as reported by qemu-img check is different when
using an external data file; we do not care about its value here, so we
can just filter it. Incidentally, common.rc already has _check_test_img
for us which does exactly that.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
---
tests/qemu-iotests/091 | 2 +-
tests/qemu-iotests/091.out | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index f4b44659ae..0874fa84c8 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -101,7 +101,7 @@ echo "Check image pattern"
${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir |
_filter_qemu_io
echo "Running 'qemu-img check -r all \$TEST_IMG'"
-"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
+_check_test_img -r all
echo "*** done"
rm -f $seq.full
diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
index 5017f8c2d9..5ec7b00f13 100644
--- a/tests/qemu-iotests/091.out
+++ b/tests/qemu-iotests/091.out
@@ -23,6 +23,4 @@ read 4194304/4194304 bytes at offset 0
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Running 'qemu-img check -r all $TEST_IMG'
No errors were found on the image.
-80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
-Image end offset: 5570560
*** done
--
2.23.0
- [PATCH v3 06/22] iotests: Replace IMGOPTS by _unsupported_imgopts, (continued)
- [PATCH v3 06/22] iotests: Replace IMGOPTS by _unsupported_imgopts, Max Reitz, 2019/11/07
- [PATCH v3 07/22] iotests: Drop compat=1.1 in 050, Max Reitz, 2019/11/07
- [PATCH v3 08/22] iotests: Let _make_test_img parse its parameters, Max Reitz, 2019/11/07
- [PATCH v3 09/22] iotests: Add -o and --no-opts to _make_test_img, Max Reitz, 2019/11/07
- [PATCH v3 10/22] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2019/11/07
- [PATCH v3 12/22] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2019/11/07
- [PATCH v3 14/22] iotests: Avoid qemu-img create, Max Reitz, 2019/11/07
- [PATCH v3 13/22] iotests: Drop IMGOPTS use in 267, Max Reitz, 2019/11/07
- [PATCH v3 11/22] iotests: Replace IMGOPTS= by -o, Max Reitz, 2019/11/07
- [PATCH v3 16/22] iotests: Avoid cp/mv of test images, Max Reitz, 2019/11/07
- [PATCH v3 17/22] iotests: Make 091 work with data_file,
Max Reitz <=
- [PATCH v3 15/22] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2019/11/07
- [PATCH v3 18/22] iotests: Make 110 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 19/22] iotests: Make 137 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 20/22] iotests: Make 198 work with data_file, Max Reitz, 2019/11/07
- [PATCH v3 22/22] iotests: Allow check -o data_file, Max Reitz, 2019/11/07
- [PATCH v3 21/22] iotests: Disable data_file where it cannot be used, Max Reitz, 2019/11/07
- Re: [PATCH v3 00/22] iotests: Allow ./check -o data_file, no-reply, 2019/11/07