Patchwork [v2] qemu-iotests: ignore fragmentation information for qed

login
register
mail settings
Submitter Robert Wang
Date April 23, 2012, 9:14 a.m.
Message ID <1335172456-3589-1-git-send-email-wdongxu@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/154354/
State New
Headers show

Comments

Robert Wang - April 23, 2012, 9:14 a.m.
We added image fragmentation statistics functions to qemu-img several days
ago, those patches will cause "./check -qed" failed. This patch will ignore
fragmentation statistics information of qed format, and then "./check -qed"
will work. 

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
---
v1->v2:
    change function _check_test_img, do not touch "check" file. 

 tests/qemu-iotests/common.rc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Robert Wang - April 23, 2012, 9:16 a.m.
Sorry, missed "v2" Lable in title.


On Mon, Apr 23, 2012 at 17:14, Dong Xu Wang <wdongxu@linux.vnet.ibm.com>wrote:

> We added image fragmentation statistics functions to qemu-img several days
> ago, those patches will cause "./check -qed" failed. This patch will ignore
> fragmentation statistics information of qed format, and then "./check -qed"
> will work.
>
> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
> ---
> v1->v2:
>    change function _check_test_img, do not touch "check" file.
>
>  tests/qemu-iotests/common.rc |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 4cb8dae..b5f6104 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -106,6 +106,7 @@ _cleanup_test_img()
>  _check_test_img()
>  {
>     $QEMU_IMG check -f $IMGFMT $TEST_IMG 2>&1 | \
> +        grep -v "fragmented$" | \
>        sed -e 's/qemu-img\: This image format does not support checks/No
> errors were found on the image./'
>  }
>
> --
> 1.7.1
>
>
Kevin Wolf - April 23, 2012, 3:47 p.m.
Am 23.04.2012 11:14, schrieb Dong Xu Wang:
> We added image fragmentation statistics functions to qemu-img several days
> ago, those patches will cause "./check -qed" failed. This patch will ignore
> fragmentation statistics information of qed format, and then "./check -qed"
> will work. 
> 
> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 4cb8dae..b5f6104 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -106,6 +106,7 @@  _cleanup_test_img()
 _check_test_img()
 {
     $QEMU_IMG check -f $IMGFMT $TEST_IMG 2>&1 | \
+        grep -v "fragmented$" | \
     	sed -e 's/qemu-img\: This image format does not support checks/No errors were found on the image./'
 }