Re: [Qemu-devel] [PATCH qom-next v3 06/15] tests: Add virtio-9p qtest

[Andreas Färber]

Am 12.03.2014 19:28, schrieb Andreas Färber:
> Make it conditional to 9p availability.
> Create a temporary directory to share.
> 
> Signed-off-by: Andreas Färber <address@hidden>
> ---
>  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 += tests/virtio-rng-test$(EXESUF)
>  gcov-files-virtio-y += hw/virtio/virtio-rng.c
>  check-qtest-virtio-y += tests/virtio-scsi-test$(EXESUF)
>  gcov-files-virtio-y += i386-softmmu/hw/scsi/virtio-scsi.c
> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
> +check-qtest-virtio-y += tests/virtio-9p-test$(EXESUF)
> +gcov-files-virtio-y += hw/9pfs/virtio-9p.c
> +gcov-files-virtio-y += i386-softmmu/hw/9pfs/virtio-9p-device.c
> +endif
>  
>  check-qtest-pci-y += tests/e1000-test$(EXESUF)
>  gcov-files-pci-y += hw/net/e1000.c
> @@ -252,6 +257,7 @@ tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.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 <stdlib.h>
> +#include <string.h>
> +#include <glib.h>
> +#include "libqtest.h"
> +#include "qemu-common.h"
> +#include "qemu/osdep.h"
> +
> +/* Tests only initialization so far. TODO: Replace with functional tests */
> +static void pci_nop(void)
> +{
> +}
> +
> +static char test_share[] = "/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 = g_strdup_printf("-fsdev 
> local,id=fsdev0,security_model=none,path=%s "
> +                           "-device 
> virtio-9p-pci,fsdev=fsdev0,mount_tag=qtest",
> +                           test_share);
> +    qtest_start(args);
> +    g_free(args);
> +
> +    ret = g_test_run();
> +
> +    qtest_end();
> +    rmdir(test_share);
> +
> +    return ret;
> +}
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg