| Message ID | 1357143393-29832-31-git-send-email-benoit@irqsave.net |
|---|---|
| State | New |
| Headers | show |
Ack. There is more than one patch to move. I'll do in for the next RFC. Regards Benoît Le Wednesday 02 Jan 2013 à 09:42:06 (-0700), Eric Blake a écrit : > On 01/02/2013 09:16 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" > > Shouldn't this patch be hoisted earlier into the series, or even > squashed in with the patch that introduced the temporary test failures? > That is, you want 'git bisect' to pass on every patch in the series, > rather than introducing problems in one patch that only get cleaned up > in a later patch. > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org >
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
Signed-off-by: Benoit Canet <benoit@irqsave.net> --- tests/qemu-iotests/common.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)