[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 34/37] block: vhdx - update _make_test_img() to fi
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 34/37] block: vhdx - update _make_test_img() to filter out vhdx options |
Date: |
Fri, 8 Nov 2013 11:12:28 +0100 |
From: Jeff Cody <address@hidden>
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/common.rc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index d24de2c..7f62457 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
--
1.8.3.1
- [Qemu-devel] [PULL v2 10/37] block: qemu-iotests, add quotes to $TEST_IMG usage in 061, (continued)
- [Qemu-devel] [PULL v2 10/37] block: qemu-iotests, add quotes to $TEST_IMG usage in 061, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 36/37] block: vhdx qemu-iotest - log replay of data sector, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 11/37] blockdev: fix drive_init() opts and bs_opts leaks, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 15/37] qdev-monitor-test: add device_add leak test cases, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 21/37] block: vhdx - log support struct and defines, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 22/37] block: vhdx - break endian translation functions out, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 26/37] block: vhdx - add region overlap detection for image files, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 28/37] block: vhdx write support, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 31/37] block: vhdx - break out code operations to functions, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 35/37] block: qemu-iotests for vhdx, add write test support, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 34/37] block: vhdx - update _make_test_img() to filter out vhdx options,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 23/37] block: vhdx - update log guid in header, and first write tracker, Stefan Hajnoczi, 2013/11/08
- [Qemu-devel] [PULL v2 19/37] block: vhdx - add header update capability., Stefan Hajnoczi, 2013/11/08