[RFC,V6,32/33] qemu-iotests: Filter dedup=on/off so existing tests don't break.

Submitted by Benoît Canet on Feb. 6, 2013, 12:32 p.m.

Details

Message ID 1360153926-9492-33-git-send-email-benoit@irqsave.net
State New
Headers show

Commit Message

Benoît Canet Feb. 6, 2013, 12:32 p.m.
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 tests/qemu-iotests/common.rc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Eric Blake Feb. 7, 2013, 9:03 p.m.
On 02/06/2013 05:32 AM, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  tests/qemu-iotests/common.rc |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index aef5f52..72e746d 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -124,7 +124,8 @@ _make_test_img()
>              -e "s# compat='[^']*'##g" \
>              -e "s# compat6=\\(on\\|off\\)##g" \
>              -e "s# static=\\(on\\|off\\)##g" \
> -            -e "s# lazy_refcounts=\\(on\\|off\\)##g"
> +            -e "s# lazy_refcounts=\\(on\\|off\\)##g" \
> +            -e "s# dedup=\\('sha256'\\|'skein'\\|'sha3'\\)##g"

This commit should be squashed in with the patch that caused the output
to change, so that 'git bisect' won't find any test failures no matter
which patch it lands on.

Patch hide | download patch | download mbox

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index aef5f52..72e746d 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -124,7 +124,8 @@  _make_test_img()
             -e "s# compat='[^']*'##g" \
             -e "s# compat6=\\(on\\|off\\)##g" \
             -e "s# static=\\(on\\|off\\)##g" \
-            -e "s# lazy_refcounts=\\(on\\|off\\)##g"
+            -e "s# lazy_refcounts=\\(on\\|off\\)##g" \
+            -e "s# dedup=\\('sha256'\\|'skein'\\|'sha3'\\)##g"
 
     # Start an NBD server on the image file, which is what we'll be talking to
     if [ $IMGPROTO = "nbd" ]; then