diff options
| author | Jeff Cody <jcody@redhat.com> | 2013-10-30 10:44:54 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-11-07 13:58:59 +0100 |
| commit | 228b234dd73383408743d749d29a6c37e9d99981 (patch) | |
| tree | a4f40ff9f64f0a01e3b0dc6ba3caa8c42f6db163 /tests | |
| parent | 3412f7b1bd8f250c34c9f933767d06b9444bb821 (diff) | |
| download | qemu-228b234dd73383408743d749d29a6c37e9d99981.tar.gz qemu-228b234dd73383408743d749d29a6c37e9d99981.tar.bz2 qemu-228b234dd73383408743d749d29a6c37e9d99981.zip | |
block: vhdx - update _make_test_img() to filter out vhdx options
The non-global option output is suppresed in _make_test_img() for
output verification in the 0?? tests. This adds suppression for
the vhdx-unique options as well. This allows check -vhdx to run
successfully.
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/common.rc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index d24de2c958..7f6245770a 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -157,7 +157,10 @@ _make_test_img() -e "s# zeroed_grain=\\(on\\|off\\)##g" \ -e "s# subformat='[^']*'##g" \ -e "s# adapter_type='[^']*'##g" \ - -e "s# lazy_refcounts=\\(on\\|off\\)##g" + -e "s# lazy_refcounts=\\(on\\|off\\)##g" \ + -e "s# block_size=[0-9]\\+##g" \ + -e "s# block_state_zero=\\(on\\|off\\)##g" \ + -e "s# log_size=[0-9]\\+##g" # Start an NBD server on the image file, which is what we'll be talking to if [ $IMGPROTO = "nbd" ]; then |