make check: Add qemu-iotests subset

Run the 'quick' group from qemu-iotests during 'make check'.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
master
Kevin Wolf 2012-03-08 12:29:00 +01:00
parent 3811f63acd
commit 8959449bb9
2 changed files with 22 additions and 0 deletions

View File

@ -1,6 +1,9 @@
export SRC_PATH
CHECKS = check-qdict check-qfloat check-qint check-qstring check-qlist
CHECKS += check-qjson test-qmp-output-visitor test-qmp-input-visitor
CHECKS += test-string-input-visitor test-string-output-visitor test-coroutine
CHECKS += $(SRC_PATH)/tests/qemu-iotests-quick.sh
check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)
@ -42,6 +45,8 @@ test-qmp-input-visitor: test-qmp-input-visitor.o $(qobject-obj-y) $(qapi-obj-y)
test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y)
test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
$(SRC_PATH)/tests/qemu-iotests-quick.sh: qemu-img qemu-io
.PHONY: check
check: $(CHECKS)
$(call quiet-command, gtester $(CHECKS), " CHECK")

17
tests/qemu-iotests-quick.sh Executable file
View File

@ -0,0 +1,17 @@
#!/bin/sh
# We don't know which of the system emulator binaries there is (or if there is
# any at all), so the 'quick' group doesn't contain any tests that require
# running qemu proper. Assign a fake binary name so that qemu-iotests doesn't
# complain about the missing binary.
export QEMU_PROG="this_should_be_unused"
export QEMU_IMG_PROG="$(pwd)/qemu-img"
export QEMU_IO_PROG="$(pwd)/qemu-io"
cd $SRC_PATH/tests/qemu-iotests
ret=0
./check -T -nocache -qcow2 -g quick || ret=1
exit $ret