Patchwork qemu-iotests: Filter out 'adapter_type'

login
register
mail settings
Submitter Fam Zheng
Date May 3, 2013, 7:31 a.m.
Message ID <1367566276-2022-1-git-send-email-famz@redhat.com>
Download mbox | patch
Permalink /patch/241236/
State New
Headers show

Comments

Fam Zheng - May 3, 2013, 7:31 a.m.
Filter out vmdk creation option 'adapter_type' for vmdk. So that tests
with an explicit './check -o adapter_type=XXX' will not fail.
---
 tests/qemu-iotests/common.rc | 1 +
 1 file changed, 1 insertion(+)
Stefan Hajnoczi - May 3, 2013, 11:06 a.m.
On Fri, May 03, 2013 at 03:31:16PM +0800, Fam Zheng wrote:
> Filter out vmdk creation option 'adapter_type' for vmdk. So that tests
> with an explicit './check -o adapter_type=XXX' will not fail.
> ---
>  tests/qemu-iotests/common.rc | 1 +
>  1 file changed, 1 insertion(+)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

Patch

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 442cf51..31eb62b 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -129,6 +129,7 @@  _make_test_img()
             -e "s# static=\\(on\\|off\\)##g" \
             -e "s# zeroed_grain=\\(on\\|off\\)##g" \
             -e "s# subformat='[^']*'##g" \
+            -e "s# adapter_type='[^']*'##g" \
             -e "s# lazy_refcounts=\\(on\\|off\\)##g"
 
     # Start an NBD server on the image file, which is what we'll be talking to