[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/12] qemu-iotests: Be more flexible with image cre
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 11/12] qemu-iotests: Be more flexible with image creation options |
Date: |
Mon, 6 Aug 2012 22:44:50 +0200 |
qemu-iotests already filters out image creation options that may be
present or not in order to get the same output in both cases. However,
often it only considers the default value of the option. Cover all valid
values instead so that ./check -o name=value can be used successfull for
all of them.
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/039.out | 6 +++---
tests/qemu-iotests/common.rc | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
index 8ad570d..155a05e 100644
--- a/tests/qemu-iotests/039.out
+++ b/tests/qemu-iotests/039.out
@@ -1,14 +1,14 @@
QA output created by 039
== Checking that image is clean on shutdown ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 lazy_refcounts=on
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
incompatible_features 0x0
No errors were found on the image.
== Creating a dirty image file ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 lazy_refcounts=on
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
incompatible_features 0x1
@@ -34,7 +34,7 @@ read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Opening a dirty image read/write should repair it ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 lazy_refcounts=on
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
incompatible_features 0x1
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index cc4e39b..7782808 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -110,11 +110,11 @@ _make_test_img()
sed -e "s#$IMGFMT#IMGFMT#g" | \
sed -e "s# encryption=off##g" | \
sed -e "s# cluster_size=[0-9]\\+##g" | \
- sed -e "s# table_size=0##g" | \
+ sed -e "s# table_size=[0-9]\\+##g" | \
sed -e "s# compat='[^']*'##g" | \
- sed -e "s# compat6=off##g" | \
- sed -e "s# static=off##g" | \
- sed -e "s# lazy_refcounts=off##g"
+ sed -e "s# compat6=\\(on\\|off\\)##g" | \
+ sed -e "s# static=\\(on\\|off\\)##g" | \
+ sed -e "s# lazy_refcounts=\\(on\\|off\\)##g"
}
_cleanup_test_img()
--
1.7.6.5
- [Qemu-devel] [PULL 00/12] Block patches, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 01/12] ide scsi: Mess with geometry only for hard disk devices, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 02/12] qapi: generalize documentation of streaming commands, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 03/12] qemu-iotests: add qed.py image manipulation utility, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 04/12] docs: add dirty bit to qcow2 specification, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 05/12] qcow2: introduce dirty bit, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 06/12] docs: add lazy refcounts bit to qcow2 specification, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 07/12] qemu-iotests: ignore qemu-img create lazy_refcounts output, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 09/12] qemu-io: add "abort" command to simulate program crash, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 08/12] qcow2: implement lazy refcounts, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 11/12] qemu-iotests: Be more flexible with image creation options,
Kevin Wolf <=
- [Qemu-devel] [PATCH 10/12] qemu-iotests: add 039 qcow2 lazy refcounts test, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 12/12] qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function, Kevin Wolf, 2012/08/06
- Re: [Qemu-devel] [PULL 00/12] Block patches, Paolo Bonzini, 2012/08/07
- Re: [Qemu-devel] [PULL 00/12] Block patches, Anthony Liguori, 2012/08/07