fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-04 11:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable test runs on 'distcheck'

Browse source 
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: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2016-11-14 09:35:56 +10:00
parent dae10bca67
commit 17c0049d24
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -4,3 +4,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
valgrind: valgrind:
(cd test; $(MAKE) valgrind) (cd test; $(MAKE) valgrind)
DISTCHECK_CONFIGURE_FLAGS = --disable-test-run

7
configure.ac
View file

@ -211,6 +211,11 @@ if test "x$build_tests" = "xyes"; then
fi fi
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 # Used by the udev rules so we can use callouts during testing without
# installing everything first. Default is the empty string so the installed # installing everything first. Default is the empty string so the installed
# rule will use udev's default path. Override is in udev/Makefile.am # 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 # # enable/disable libwacom #
########################### ###########################
AC_ARG_ENABLE(libwacom, AC_ARG_ENABLE(libwacom,
AS_HELP_STRING([--enable-libwacom], AS_HELP_STRING([--enable-libwacom],
[Use libwacom for tablet identification (default=enabled)]), [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"]) [test "x$libwacom_have_get_paired_device" == "xyes"])
AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"]) 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(BUILD_DOCS, [test "x$build_documentation" = "xyes"])
AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes]) AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes])
AM_CONDITIONAL(BUILD_EVENTGUI, [test "x$build_eventgui" = "xyes"]) AM_CONDITIONAL(BUILD_EVENTGUI, [test "x$build_eventgui" = "xyes"])

3
test/Makefile.am
View file

@ -90,7 +90,10 @@ build_tests = \
noinst_PROGRAMS = $(build_tests) $(run_tests) noinst_PROGRAMS = $(build_tests) $(run_tests)
noinst_SCRIPTS = symbols-leak-test noinst_SCRIPTS = symbols-leak-test
if RUN_TESTS
TESTS = $(run_tests) symbols-leak-test TESTS = $(run_tests) symbols-leak-test
endif
libinput_test_suite_runner_SOURCES = udev.c \ libinput_test_suite_runner_SOURCES = udev.c \
path.c \ path.c \