diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-04 15:46:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-04 15:51:58 +1000 |
| commit | 1e9fb4fe02df00796fe6d619c1728e1b678ed921 (patch) | |
| tree | f741fdae0077cc354346917de3f4ab8816021446 | |
| parent | 1489287bf1d4e685de375b5c7aeb06fe133addfc (diff) | |
| download | libevdev-1e9fb4fe02df00796fe6d619c1728e1b678ed921.tar.gz | |
test: drop the valgrind make check wrappers from autotools
We have meson with a proper test suite setup and this currently breaks
the CI due to some Arch issues with glibc debuginfo packages. Let's just
drop this so we don't run valgrind unconditionally.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index a927dff..455dbca 100644 --- a/configure.ac +++ b/configure.ac @@ -59,12 +59,9 @@ AC_CHECK_LIB([m], [round]) PKG_PROG_PKG_CONFIG() PKG_CHECK_MODULES(CHECK, [check >= 0.9.9], [HAVE_CHECK="yes"], [HAVE_CHECK="no"]) -if test "x$HAVE_CHECK" = "xyes"; then - AC_PATH_PROG(VALGRIND, [valgrind]) -else +if test "x$HAVE_CHECK" != "xyes"; then AC_MSG_WARN([check not found - skipping building unit tests]) fi -AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x$HAVE_CHECK" = "xyes"]) AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"]) diff --git a/test/Makefile.am b/test/Makefile.am index 5f0c008..d6f4fe2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -89,24 +89,11 @@ test_kernel_SOURCES = \ test_kernel_CFLAGS = -I$(top_srcdir) test_kernel_LDADD = $(CHECK_LIBS) $(top_builddir)/libevdev/libevdev.la -if HAVE_VALGRIND -VALGRIND_FLAGS=--leak-check=full \ - --quiet \ - --error-exitcode=3 \ - --suppressions=$(srcdir)/valgrind.suppressions - -valgrind: - $(MAKE) check-TESTS CK_TIMEOUT_MULTIPLIER=10 LOG_COMPILER="$(VALGRIND)" LOG_FLAGS="$(VALGRIND_FLAGS)" - -check_local_deps += valgrind - -endif - if GCOV_ENABLED CLEANFILES = gcov-reports/*.gcov gcov-reports/summary.txt *.gcno *.gcda -gcov-report: generate-gcov-report.sh check-TESTS +gcov-report: generate-gcov-report.sh $(AM_V_GEN)$(srcdir)/generate-gcov-report.sh gcov-reports $(top_builddir)/libevdev $(builddir) gcov: gcov-report |