Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
meson.build | 2 ++
tests/Makefile.am | 32 --------------------------------
tests/meson.build | 30 ++++++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 32 deletions(-)
create mode 100644 tests/meson.build
diff --git a/meson.build b/meson.build
index b623ddbf4fd..2e894df1ab2 100644
--- a/meson.build
+++ b/meson.build
@@ -2205,6 +2205,8 @@ subdir('src')
subdir('tools')
+subdir('tests')
+
# generate meson-config.h file
configure_file(output: 'meson-config.h', configuration: conf)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b384f3d0c2..79fc271ac64 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,38 +16,6 @@
## License along with this library. If not, see
## <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = \
- -I$(top_builddir) -I$(top_srcdir) \
- -I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_builddir)/src -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/util \
- -I$(top_srcdir)/src/conf \
- -I$(top_srcdir)/src/hypervisor \
- -I$(top_builddir)/src/rpc \
- $(NULL)
-
-WARN_CFLAGS += $(RELAXED_FRAME_LIMIT_CFLAGS)
-
-AM_CFLAGS = \
- -Dabs_builddir="\"$(abs_builddir)\"" \
- -Dabs_top_builddir="\"$(abs_top_builddir)\"" \
- -Dabs_srcdir="\"$(abs_srcdir)\"" \
- -Dabs_top_srcdir="\"$(abs_top_srcdir)\"" \
- $(LIBXML_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(LIBNL_CFLAGS) \
- $(GNUTLS_CFLAGS) \
- $(SASL_CFLAGS) \
- $(SELINUX_CFLAGS) \
- $(APPARMOR_CFLAGS) \
- $(YAJL_CFLAGS) \
- $(COVERAGE_CFLAGS) \
- $(XDR_CFLAGS) \
- $(WARN_CFLAGS)
-
-AM_LDFLAGS = \
- -export-dynamic
-
MOCKLIBS_LDFLAGS = -avoid-version \
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 00000000000..ab4acbbea9d
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,30 @@
+tests_dep = declare_dependency(
+ compile_args: [
+ '-Dabs_builddir="@0@"'.format(meson.current_build_dir()),
+ '-Dabs_top_builddir="@0@"'.format(meson.build_root()),
+ '-Dabs_srcdir="@0@"'.format(meson.current_source_dir()),
+ '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
+ ] + coverage_flags + cc_flags_relaxed_frame_limit,
+ dependencies: [
+ apparmor_dep,
+ dlopen_dep,
+ glib_dep,
+ gnutls_dep,
+ libnl_dep,
+ libxml_dep,
+ rpc_dep,
+ sasl_dep,
+ selinux_dep,
+ xdr_dep,
+ yajl_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ hypervisor_inc_dir,
+ libvirt_inc,
+ src_inc_dir,
+ top_inc_dir,
+ util_inc_dir,
+ ],
+ link_args: libvirt_export_dynamic,
+)
--
2.26.2
