[libvirt PATCH 290/351] meson: tests: add ESX specific tests

Peter Krempa pkrempa at redhat.com
Tue Jul 28 12:06:08 UTC 2020


On Thu, Jul 16, 2020 at 11:58:46 +0200, Pavel Hrdina wrote:
> Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> ---
>  src/esx/meson.build |  2 ++
>  tests/Makefile.am   | 14 --------------
>  tests/meson.build   |  6 ++++++
>  3 files changed, 8 insertions(+), 14 deletions(-)
> 
> diff --git a/src/esx/meson.build b/src/esx/meson.build
> index 1718411d759..469c2044c63 100644
> --- a/src/esx/meson.build
> +++ b/src/esx/meson.build
> @@ -63,3 +63,5 @@ if conf.has('WITH_ESX')
>  else
>    sym_files += 'libvirt_esx.syms'
>  endif
> +
> +esx_inc_dir = include_directories('.')
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index b721b135cfd..55369717cd9 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -70,10 +70,6 @@ if WITH_OPENVZ
>  test_programs += openvzutilstest
>  endif WITH_OPENVZ
>  
> -if WITH_ESX
> -test_programs += esxutilstest
> -endif WITH_ESX
> -
>  if WITH_VBOX
>  test_programs += vboxsnapshotxmltest
>  endif WITH_VBOX
> @@ -375,16 +371,6 @@ openvzutilstest_LDADD = $(LDADDS) \
>  	../src/libvirt_driver_openvz.la
>  endif ! WITH_OPENVZ
>  
> -if WITH_ESX
> -esxutilstest_SOURCES = \
> -	esxutilstest.c \
> -	testutils.c testutils.h
> -esxutilstest_LDADD = $(LDADDS)
> -esxutilstest_CFLAGS = \
> -	-I$(top_builddir)/src/esx \
> -	$(AM_CFLAGS)
> -endif ! WITH_ESX
> -
>  if WITH_VBOX
>  vboxsnapshotxmltest_SOURCES = \
>  	vboxsnapshotxmltest.c \
> diff --git a/tests/meson.build b/tests/meson.build
> index 86f12a58f7b..1eded8454f1 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -356,6 +356,12 @@ if conf.has('WITH_DBUS')
>    endif
>  endif
>  
> +if conf.has('WITH_ESX')
> +  tests += [
> +    { 'name': 'esxutilstest', 'include': [ esx_inc_dir ], 'deps': [ dbus_dep ] },

dbus? that doesn't seem right.

> +  ]




More information about the libvir-list mailing list