From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 27 Jul 2020 09:36:22 +0000 (+0200)
Subject: meson: tests: add ESX specific tests
X-Git-Tag: v6.7.0-rc1~313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53481f65d7187a596b9ec29229ad9cb6759488cb;p=thirdparty%2Flibvirt.git

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>
---

diff --git a/src/esx/meson.build b/src/esx/meson.build
index a79cc5b834..f2d59462fe 100644
--- a/src/esx/meson.build
+++ b/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('.')
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ace1ae827c..381a7921cf 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
@@ -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 \
diff --git a/tests/meson.build b/tests/meson.build
index 63106fc0b6..bc42b1c86a 100644
--- a/tests/meson.build
+++ b/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(