meson: tests: add ESX specific tests

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

src/esx/meson.build

@@ -62,3 +62,5 @@ if conf.has('WITH_ESX')
 else
   sym_files += 'libvirt_esx.syms'
 endif
+
+esx_inc_dir = include_directories('.')

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
@@ -371,16 +367,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 \

tests/meson.build

@@ -366,6 +366,12 @@ if conf.has('WITH_DBUS')
   endif
 endif
 
+if conf.has('WITH_ESX')
+  tests += [
+    { 'name': 'esxutilstest', 'include': [ esx_inc_dir ] },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0@.c'.format(data['name'])
   test_bin = executable(