Skip to content
Snippets Groups Projects
Commit 17c0049d authored by Peter Hutterer's avatar Peter Hutterer
Browse files

Disable test runs on 'distcheck'


The tests require the creation of udev devices which in turn require root and
usually cause distcheck runs to fail. Add a new option to disable the
*running* of tests at distcheck (we still want to build them).

Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
parent dae10bca
No related branches found
No related tags found
No related merge requests found
......@@ -4,3 +4,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
valgrind:
(cd test; $(MAKE) valgrind)
DISTCHECK_CONFIGURE_FLAGS = --disable-test-run
......@@ -211,6 +211,11 @@ if test "x$build_tests" = "xyes"; then
fi
fi
AC_ARG_ENABLE(test-run,
AS_HELP_STRING([--enable-test-run], [For internal use only]),
[run_tests="$enableval"],
[run_tests="yes"])
# Used by the udev rules so we can use callouts during testing without
# installing everything first. Default is the empty string so the installed
# rule will use udev's default path. Override is in udev/Makefile.am
......@@ -220,6 +225,7 @@ AC_PATH_PROG(SED, [sed])
###########################
# enable/disable libwacom #
###########################
AC_ARG_ENABLE(libwacom,
AS_HELP_STRING([--enable-libwacom],
[Use libwacom for tablet identification (default=enabled)]),
......@@ -251,6 +257,7 @@ AM_CONDITIONAL(HAVE_LIBWACOM_GET_PAIRED_DEVICE,
[test "x$libwacom_have_get_paired_device" == "xyes"])
AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"])
AM_CONDITIONAL(RUN_TESTS, [test "x$run_tests" = "xyes"])
AM_CONDITIONAL(BUILD_DOCS, [test "x$build_documentation" = "xyes"])
AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes])
AM_CONDITIONAL(BUILD_EVENTGUI, [test "x$build_eventgui" = "xyes"])
......
......@@ -90,7 +90,10 @@ build_tests = \
noinst_PROGRAMS = $(build_tests) $(run_tests)
noinst_SCRIPTS = symbols-leak-test
if RUN_TESTS
TESTS = $(run_tests) symbols-leak-test
endif
libinput_test_suite_runner_SOURCES = udev.c \
path.c \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment