aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/198
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2019-11-07 17:37:06 +0100
committerMax Reitz <mreitz@redhat.com>2020-01-06 13:43:07 +0100
commit39d2c7dc8f444c181c4ae2e52ca687ea05decc0e (patch)
treee71644240c2a707eb9c3415d0ae2302e32a01bcd /tests/qemu-iotests/198
parente66566e6a77c283c0908375bb58037a0ae7ad703 (diff)
downloadqemu-39d2c7dc8f444c181c4ae2e52ca687ea05decc0e.zip
qemu-39d2c7dc8f444c181c4ae2e52ca687ea05decc0e.tar.gz
qemu-39d2c7dc8f444c181c4ae2e52ca687ea05decc0e.tar.bz2
iotests: Make 198 work with data_file
We do not care about the json:{} filenames here, so we can just filter them out and thus make the test work both with and without external data files. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Message-id: 20191107163708.833192-21-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/198')
-rwxr-xr-xtests/qemu-iotests/1986
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index c8f824c..fb0d5a2 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -92,13 +92,15 @@ echo
echo "== checking image base =="
$QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
| sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
- -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+ | _filter_json_filename
echo
echo "== checking image layer =="
$QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
| sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
- -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+ | _filter_json_filename
# success, all done