Re: [Qemu-devel] [PATCH v3 5/7] blockdev-test: add test case for drive_add duplicate IDs

[Andreas Färber]

Am 30.10.2013 14:54, schrieb Stefan Hajnoczi:
> The following should work:
> 
>   (qemu) drive_add if=none,id=drive0
>   (qemu) drive_del drive0
>   (qemu) drive_add if=none,id=drive0
> 
> Previous versions of QEMU produced a duplicate ID error because
> drive_add leaked the options.
> 
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
>  tests/Makefile        |  2 ++
>  tests/blockdev-test.c | 59 
> +++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 61 insertions(+)
>  create mode 100644 tests/blockdev-test.c
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index fa4c9f0..7863123 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -67,6 +67,7 @@ check-qtest-i386-y += tests/boot-order-test$(EXESUF)
>  check-qtest-i386-y += tests/rtc-test$(EXESUF)
>  check-qtest-i386-y += tests/i440fx-test$(EXESUF)
>  check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
> +check-qtest-i386-y += tests/blockdev-test$(EXESUF)
>  check-qtest-x86_64-y = $(check-qtest-i386-y)
>  gcov-files-i386-y += i386-softmmu/hw/mc146818rtc.c

What's missing here is to add the source file(s) for gcov checking. But
can be done as follow-up, just don't forget. :)

>  gcov-files-x86_64-y = $(subst 
> i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
> @@ -174,6 +175,7 @@ tests/boot-order-test$(EXESUF): tests/boot-order-test.o 
> $(libqos-obj-y)
>  tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
>  tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
>  tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
> +tests/blockdev-test$(EXESUF): tests/blockdev-test.o $(libqos-pc-obj-y)
>  tests/qemu-iotests/socket_scm_helper$(EXESUF): 
> tests/qemu-iotests/socket_scm_helper.o
>  
>  # QTest rules
> diff --git a/tests/blockdev-test.c b/tests/blockdev-test.c
> new file mode 100644
> index 0000000..8b7371e
> --- /dev/null
> +++ b/tests/blockdev-test.c
[...]
> +int main(int argc, char **argv)
> +{
> +    g_test_init(&argc, &argv, NULL);
> +
> +    qtest_add_func("/qdev/drive_add_empty", test_drive_add_empty);

I would prefer not to name that "qdev" if you can think of something
better... otherwise test looks fine.

Andreas

> +
> +    return g_test_run();
> +}
> 


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