Re: [PULL 06/14] test: new qTest case to test the vhost-user-blk-server

[Philippe Mathieu-Daudé]

On 5/14/21 6:31 PM, Kevin Wolf wrote:
> From: Coiby Xu <coiby.xu@gmail.com>
> 
> This test case has the same tests as tests/virtio-blk-test.c except for
> tests have block_resize. Since the vhost-user-blk export only serves one
> client one time, two exports are started by qemu-storage-daemon for the
> hotplug test.
> 
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> Message-Id: <20210309094106.196911-3-stefanha@redhat.com>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> Message-Id: <20210322092327.150720-2-stefanha@redhat.com>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qtest/libqos/vhost-user-blk.h |  48 ++
>  tests/qtest/libqos/vhost-user-blk.c | 130 +++++
>  tests/qtest/vhost-user-blk-test.c   | 794 ++++++++++++++++++++++++++++
>  MAINTAINERS                         |   2 +
>  tests/qtest/libqos/meson.build      |   1 +
>  tests/qtest/meson.build             |   4 +
>  6 files changed, 979 insertions(+)
>  create mode 100644 tests/qtest/libqos/vhost-user-blk.h
>  create mode 100644 tests/qtest/libqos/vhost-user-blk.c
>  create mode 100644 tests/qtest/vhost-user-blk-test.c

> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 49de74ff59..7ecb7fea51 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -231,6 +231,9 @@ if have_virtfs
>    qos_test_ss.add(files('virtio-9p-test.c'))
>  endif
>  qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: 
> files('vhost-user-test.c'))
> +if have_vhost_user_blk_server

When building with --disable-tools I get:

sh: 1: exec: ./storage-daemon/qemu-storage-daemon: not found

Maybe:

if have_tools and have_vhost_user_blk_server

?

> +  qos_test_ss.add(files('vhost-user-blk-test.c'))
> +endif
>  
>  tpmemu_files = ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c']
>  
> @@ -269,6 +272,7 @@ foreach dir : target_dirs
>    endif
>    qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 
> 'tests/dbus-vmstate-daemon.sh')
>    qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base)
> +  qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', 
> './storage-daemon/qemu-storage-daemon')
>    
>    foreach test : target_qtests
>      # Executables are shared across targets, declare them only the first 
> time we
>