diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2012-03-08 12:29:00 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-03-12 15:14:07 +0100 |
| commit | 8959449bb9b16e3b19cf35823d3358eb7d461210 (patch) | |
| tree | 606f2c4f3e00adf97ebf8b5d10492b781a3a276c | |
| parent | 3811f63acdc0584e053d09f7070063ed0a9bafe6 (diff) | |
make check: Add qemu-iotests subset
Run the 'quick' group from qemu-iotests during 'make check'.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | tests/Makefile | 5 | ||||
| -rwxr-xr-x | tests/qemu-iotests-quick.sh | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 74b29dc076..571ad42896 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -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") diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh new file mode 100755 index 0000000000..cf90de0b8b --- /dev/null +++ b/tests/qemu-iotests-quick.sh @@ -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 |