meson: tests: add valgrind test setup

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/Makefile.am b/Makefile.am
index d05a0c1a85a856207e8dd4d8499a5806a3a066be..549ade3db2000054ba9e680dee11589d9dad122e 100644 (file)
--- 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 4ac18cbd67a25997d6023712df32047f342b6ab7..b7bfb1c26d20477c94ca5ce3467d79cb04758464 100644 (file)
--- 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 (file)
index 04c37cc..0000000
--- 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 3bbdddc1f72feae70469aa47ebde007fae0f6b37..b5f6e2267aaffaeaee06735bf58020472f5d141e 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -687,3 +687,15 @@ add_test_setup(
   ],
   exe_wrapper: [ python3_prog, check_file_access_prog.path() ],
 )
+
+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',
+  ],
+  # default timeout in meson is 30s
+  timeout_multiplier: 4,
+)