[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 5/6] qemu-iotests: Discard specific info in _img_
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 5/6] qemu-iotests: Discard specific info in _img_info |
Date: |
Tue, 1 Oct 2013 14:32:01 +0200 |
In _img_info, filter out additional information specific to the image
format provided by qemu-img info, since tests designed for multiple
image formats would produce different outputs for every image format
otherwise.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/common.rc | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 1b22db0..73b7dde 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -197,12 +197,30 @@ _check_test_img()
_img_info()
{
+ discard=0
+ regex_json_spec_start='^ *"format-specific": \{'
$QEMU_IMG info "$@" "$TEST_IMG" 2>&1 | \
sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
-e "s#$TEST_DIR#TEST_DIR#g" \
-e "s#$IMGFMT#IMGFMT#g" \
-e "/^disk size:/ D" \
- -e "/actual-size/ D"
+ -e "/actual-size/ D" | \
+ while IFS='' read line; do
+ if [[ $line == "Format specific information:" ]]; then
+ discard=1
+ elif [[ $line =~ $regex_json_spec_start ]]; then
+ discard=2
+ regex_json_spec_end="^${line%%[^ ]*}\\}, *$"
+ fi
+ if [[ $discard == 0 ]]; then
+ echo "$line"
+ elif [[ $discard == 1 && ! $line ]]; then
+ echo
+ discard=0
+ elif [[ $discard == 2 && $line =~ $regex_json_spec_end ]]; then
+ discard=0
+ fi
+ done
}
_get_pids_by_name()
--
1.8.3.1
- [Qemu-devel] [PATCH v6 0/6] Provide additional info through qemu-img info, Max Reitz, 2013/10/01
- [Qemu-devel] [PATCH v6 1/6] qapi: Add ImageInfoSpecific type, Max Reitz, 2013/10/01
- [Qemu-devel] [PATCH v6 2/6] block: Add bdrv_get_specific_info, Max Reitz, 2013/10/01
- [Qemu-devel] [PATCH v6 3/6] block/qapi: Human-readable ImageInfoSpecific dump, Max Reitz, 2013/10/01
- [Qemu-devel] [PATCH v6 4/6] qcow2: Add support for ImageInfoSpecific, Max Reitz, 2013/10/01
- [Qemu-devel] [PATCH v6 6/6] qemu-iotests: Additional info from qemu-img info, Max Reitz, 2013/10/01
- [Qemu-devel] [PATCH v6 5/6] qemu-iotests: Discard specific info in _img_info,
Max Reitz <=
- Re: [Qemu-devel] [PATCH v6 0/6] Provide additional info through qemu-img info, Eric Blake, 2013/10/01