| Message ID | 1335170591-20545-1-git-send-email-wdongxu@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
Am 23.04.2012 10:43, 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> > --- > tests/qemu-iotests/check | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > index aae1378..b836780 100755 > --- a/tests/qemu-iotests/check > +++ b/tests/qemu-iotests/check > @@ -243,7 +243,7 @@ do > echo " - no qualified output" > err=true > else > - if diff -w $seq.out $tmp.out >/dev/null 2>&1 > + if diff -w -I "fragmented$" $seq.out $tmp.out >/dev/null 2>&1 > then > echo "" > if $err > @@ -255,7 +255,7 @@ do > else > echo " - output mismatch (see $seq.out.bad)" > mv $tmp.out $seq.out.bad > - $diff -w $seq.out $seq.out.bad > + $diff -w -I "fragmented$" $seq.out $seq.out.bad > err=true > fi > fi Please add a pipe to grep/sed to _check_test_img in common.rc instead. Kevin
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index aae1378..b836780 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -243,7 +243,7 @@ do echo " - no qualified output" err=true else - if diff -w $seq.out $tmp.out >/dev/null 2>&1 + if diff -w -I "fragmented$" $seq.out $tmp.out >/dev/null 2>&1 then echo "" if $err @@ -255,7 +255,7 @@ do else echo " - output mismatch (see $seq.out.bad)" mv $tmp.out $seq.out.bad - $diff -w $seq.out $seq.out.bad + $diff -w -I "fragmented$" $seq.out $seq.out.bad err=true fi fi
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> --- tests/qemu-iotests/check | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)