From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTDdm-0006ao-SO for qemu-devel@nongnu.org; Thu, 27 Mar 2014 12:59:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTDdh-0002Db-Uf for qemu-devel@nongnu.org; Thu, 27 Mar 2014 12:58:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTDdh-0002DN-MB for qemu-devel@nongnu.org; Thu, 27 Mar 2014 12:58:49 -0400 Message-ID: <533451D4.1020500@redhat.com> Date: Thu, 27 Mar 2014 17:29:08 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1394648907-20096-1-git-send-email-afaerber@suse.de> <1394648907-20096-7-git-send-email-afaerber@suse.de> <53344B44.2080800@suse.de> In-Reply-To: <53344B44.2080800@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-next v3 06/15] tests: Add virtio-9p qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , qemu-devel@nongnu.org Cc: "Aneesh Kumar K.V" , Stefan Hajnoczi Il 27/03/2014 17:01, Andreas F=C3=A4rber ha scritto: > Am 12.03.2014 19:28, schrieb Andreas F=C3=A4rber: >> Make it conditional to 9p availability. >> Create a temporary directory to share. >> >> Signed-off-by: Andreas F=C3=A4rber >> --- >> tests/Makefile | 6 ++++++ >> tests/virtio-9p-test.c | 46 +++++++++++++++++++++++++++++++++++++++++= +++++ >> 2 files changed, 52 insertions(+) >> create mode 100644 tests/virtio-9p-test.c > > Ping! Any objections to applying this first conditional test case? This > would complete the virtio tests, I believe. > > Thanks, > Andreas > >> >> diff --git a/tests/Makefile b/tests/Makefile >> index 75b4659..117e606 100644 >> --- a/tests/Makefile >> +++ b/tests/Makefile >> @@ -80,6 +80,11 @@ check-qtest-virtio-y +=3D tests/virtio-rng-test$(EX= ESUF) >> gcov-files-virtio-y +=3D hw/virtio/virtio-rng.c >> check-qtest-virtio-y +=3D tests/virtio-scsi-test$(EXESUF) >> gcov-files-virtio-y +=3D i386-softmmu/hw/scsi/virtio-scsi.c >> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) >> +check-qtest-virtio-y +=3D tests/virtio-9p-test$(EXESUF) >> +gcov-files-virtio-y +=3D hw/9pfs/virtio-9p.c >> +gcov-files-virtio-y +=3D i386-softmmu/hw/9pfs/virtio-9p-device.c >> +endif >> >> check-qtest-pci-y +=3D tests/e1000-test$(EXESUF) >> gcov-files-pci-y +=3D hw/net/e1000.c >> @@ -252,6 +257,7 @@ tests/virtio-blk-test$(EXESUF): tests/virtio-blk-t= est.o >> tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o >> tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o >> tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o >> +tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o >> tests/tpci200-test$(EXESUF): tests/tpci200-test.o >> tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o >> tests/qom-test$(EXESUF): tests/qom-test.o >> diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c >> new file mode 100644 >> index 0000000..1fae477 >> --- /dev/null >> +++ b/tests/virtio-9p-test.c >> @@ -0,0 +1,46 @@ >> +/* >> + * QTest testcase for VirtIO 9P >> + * >> + * Copyright (c) 2014 SUSE LINUX Products GmbH >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or= later. >> + * See the COPYING file in the top-level directory. >> + */ >> + >> +#include >> +#include >> +#include >> +#include "libqtest.h" >> +#include "qemu-common.h" >> +#include "qemu/osdep.h" >> + >> +/* Tests only initialization so far. TODO: Replace with functional te= sts */ >> +static void pci_nop(void) >> +{ >> +} >> + >> +static char test_share[] =3D "/tmp/qtest.XXXXXX"; >> + >> +int main(int argc, char **argv) >> +{ >> + char *args; >> + int ret; >> + >> + g_test_init(&argc, &argv, NULL); >> + qtest_add_func("/virtio/9p/pci/nop", pci_nop); >> + >> + g_assert(mkdtemp(test_share)); >> + >> + args =3D g_strdup_printf("-fsdev local,id=3Dfsdev0,security_model= =3Dnone,path=3D%s " >> + "-device virtio-9p-pci,fsdev=3Dfsdev0,moun= t_tag=3Dqtest", >> + test_share); >> + qtest_start(args); >> + g_free(args); >> + >> + ret =3D g_test_run(); >> + >> + qtest_end(); >> + rmdir(test_share); >> + >> + return ret; >> +} >> > > Fine by me. Paolo