From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S65XF-0002to-Bm for qemu-devel@nongnu.org; Fri, 09 Mar 2012 14:31:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S65XA-0004Y1-ET for qemu-devel@nongnu.org; Fri, 09 Mar 2012 14:31:28 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:58123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S65XA-0004Xw-AC for qemu-devel@nongnu.org; Fri, 09 Mar 2012 14:31:24 -0500 Received: by ghrr14 with SMTP id r14so1269031ghr.4 for ; Fri, 09 Mar 2012 11:31:22 -0800 (PST) Message-ID: <4F5A5A86.2030704@redhat.com> Date: Fri, 09 Mar 2012 13:31:18 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1331297197-4289-1-git-send-email-kwolf@redhat.com> <1331297197-4289-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1331297197-4289-3-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 2/3] make check: Add qemu-iotests subset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: stefanha@gmail.com, qemu-devel@nongnu.org On 03/09/2012 06:46 AM, Kevin Wolf wrote: > Run the 'quick' group from qemu-iotests during 'make check'. > > Signed-off-by: Kevin Wolf > --- > tests/Makefile | 5 +++++ > tests/qemu-iotests-quick.sh | 17 +++++++++++++++++ > 2 files changed, 22 insertions(+), 0 deletions(-) > create mode 100755 tests/qemu-iotests-quick.sh > > diff --git a/tests/Makefile b/tests/Makefile > index 74b29dc..571ad42 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 Not to suggest that we don't start here, but I think we should look into how to make qemu-iotest use gtester in the near future. That will allow the qemu-iotest to be part of the make check-report output and will provide an easy way for other tools (like autotest) to run these tests. Regards, Anthony Liguori > > 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 0000000..cf90de0 > --- /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