[libvirt PATCH 313/351] meson: tests: add valgrind test setup

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 Makefile.am       |  4 +---
 configure.ac      |  3 +--
 tests/Makefile.am | 23 -----------------------
 tests/meson.build | 11 +++++++++++
 4 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 tests/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d05a0c1a85a..549ade3db20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 DISTCHECK_CONFIGURE_FLAGS = --enable-werror
 
 SUBDIRS = . docs \
-  tests po examples
+  po examples
 
 XZ_OPT ?= -v -T0
 export XZ_OPT
@@ -35,8 +35,6 @@ rpm: clean
 srpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz)
 
-check-local: all tests
-
 dist-hook: gen-AUTHORS
 
 .PHONY: gen-AUTHORS
diff --git a/configure.ac b/configure.ac
index 20926ee9f19..78676d73d2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,5 @@ AC_CONFIG_FILES([\
         libvirt-admin.pc \
         libvirt.spec mingw-libvirt.spec \
         po/Makefile \
-        examples/Makefile \
-        tests/Makefile])
+        examples/Makefile])
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 04c37ccda2e..00000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-## Copyright (C) 2005-2019 Red Hat, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-VALGRIND = valgrind --quiet --leak-check=full --trace-children=yes \
-	--trace-children-skip="*/tools/virsh","*/tests/commandhelper","/usr/bin/*" \
-	--suppressions=$(abs_srcdir)/.valgrind.supp
-valgrind:
-	$(MAKE) check VG="$(LIBTOOL) --mode=execute $(VALGRIND)"
diff --git a/tests/meson.build b/tests/meson.build
index cf848678505..1510d6ef3f3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -673,3 +673,14 @@ add_test_setup(
   ],
   exe_wrapper: [ meson_python_prog, check_file_access_prog ],
 )
+
+add_test_setup(
+  'valgrind',
+  exe_wrapper: [
+    'valgrind', '--quiet', '--leak-check=full', '--trace-children=yes',
+    '--trace-children-skip="*/tools/virsh,*/tests/commandhelper,/usr/bin/*"',
+    '--suppressions=@0@'.format(meson.current_source_dir() / '.valgrind.supp'),
+    '--error-exitcode=1',
+  ],
+  timeout_multiplier: 4,
+)
-- 
2.26.2