From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5bXG-00062t-4V for qemu-devel@nongnu.org; Thu, 08 Mar 2012 06:29:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5bXB-0006qo-95 for qemu-devel@nongnu.org; Thu, 08 Mar 2012 06:29:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5bXB-0006pU-1U for qemu-devel@nongnu.org; Thu, 08 Mar 2012 06:29:25 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q28BTNno008941 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 8 Mar 2012 06:29:23 -0500 From: Kevin Wolf Date: Thu, 8 Mar 2012 12:32:52 +0100 Message-Id: <1331206372-10405-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1331206372-10405-1-git-send-email-kwolf@redhat.com> References: <1331206372-10405-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] make check: Add qemu-iotests subset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Run the 'quick' group from qemu-iotests during 'make check'. Signed-off-by: Kevin Wolf --- tests/Makefile | 1 + tests/qemu-iotests.sh | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) create mode 100755 tests/qemu-iotests.sh diff --git a/tests/Makefile b/tests/Makefile index 74b29dc..155ecbd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,6 +1,7 @@ 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 += tests/qemu-iotests.sh check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS) diff --git a/tests/qemu-iotests.sh b/tests/qemu-iotests.sh new file mode 100755 index 0000000..af99635 --- /dev/null +++ b/tests/qemu-iotests.sh @@ -0,0 +1,18 @@ +#!/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 tests/qemu-iotests + +ret=0 +./check -T -nocache -raw -g quick || ret=1 +./check -T -nocache -qcow2 -g quick || ret=1 + +exit $ret -- 1.7.6.5