[Qemu-devel] [PATCH v2 0/3] tests: Add check-block to "make check"

[Qemu-devel] [PATCH v2 0/3] tests: Add check-block to "make check"

[Fam Zheng]

qemu-iotests contains useful tests that have a nice coverage of block layer
code. Adding check-block (which calls tests/qemu-iotests-quick.sh) to "make
check" is good for developers' self-testing.

v2: Address comments from reviewing of v1:
    Remove 091 from quick group. (Kevin)
    Add Max's rev-by in patch 2. (Max)
    Allow overriding TEST_DIR, and leave "-c writeback" out in patch 3.
    (Markus, Kevin)



Fam Zheng (3):
  qemu-iotests: Remove 091 from quick group
  qemu-iotests: Speed up make check-block
  tests/Makefile: Add check-block to make check

 tests/Makefile              | 2 +-
 tests/qemu-iotests-quick.sh | 2 +-
 tests/qemu-iotests/check    | 1 +
 tests/qemu-iotests/group    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

-- 
1.9.3

[Qemu-devel] [PATCH v2 1/3] qemu-iotests: Remove 091 from quick group

[Fam Zheng]

For the purpose of allowing running quick group on tmpfs.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/group | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index a4742c6..08099b9 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -97,7 +97,7 @@
 088 rw auto quick
 089 rw auto quick
 090 rw auto quick
-091 rw auto quick
+091 rw auto
 092 rw auto quick
 095 rw auto quick
 097 rw auto backing
-- 
1.9.3

[Qemu-devel] [PATCH v2 2/3] qemu-iotests: Speed up make check-block

[Fam Zheng]

Using /tmp, which is usually mounted as tmpfs, the quick group can be
quicker.

On my laptop (Lenovo T430s with Fedora 20), this reduces the time from
50s to 30s.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests-quick.sh | 2 +-
 tests/qemu-iotests/check    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
index 12af731..0e554bb 100755
--- a/tests/qemu-iotests-quick.sh
+++ b/tests/qemu-iotests-quick.sh
@@ -3,6 +3,6 @@
 cd tests/qemu-iotests
 
 ret=0
-./check -T -qcow2 -g quick || ret=1
+TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
 
 exit $ret
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 8ca4011..baeae80 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -238,6 +238,7 @@ QEMU_NBD      -- $QEMU_NBD
 IMGFMT        -- $FULL_IMGFMT_DETAILS
 IMGPROTO      -- $FULL_IMGPROTO_DETAILS
 PLATFORM      -- $FULL_HOST_DETAILS
+TEST_DIR      -- $TEST_DIR
 SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
 
 EOF
-- 
1.9.3

[Qemu-devel] [PATCH v2 3/3] tests/Makefile: Add check-block to make check

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index 16f0e4c..f430b18 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -463,7 +463,7 @@ check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y))
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-unit: $(patsubst %,check-%, $(check-unit-y))
 check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-qapi-schema check-unit check-qtest
+check: check-qapi-schema check-unit check-qtest check-block
 check-clean:
 	$(MAKE) -C tests/tcg clean
 	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 0/3] tests: Add check-block to "make check"

[Kevin Wolf]

Am 15.12.2014 um 06:07 hat Fam Zheng geschrieben:
> qemu-iotests contains useful tests that have a nice coverage of block layer
> code. Adding check-block (which calls tests/qemu-iotests-quick.sh) to "make
> check" is good for developers' self-testing.
> 
> v2: Address comments from reviewing of v1:
>     Remove 091 from quick group. (Kevin)
>     Add Max's rev-by in patch 2. (Max)
>     Allow overriding TEST_DIR, and leave "-c writeback" out in patch 3.
>     (Markus, Kevin)

Thanks, applied to the block branch.

Kevin