Having a suffix means we can use some automake features that rely on the suffix
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- .gitignore | 2 +- test/Makefile.am | 202 +++++++++++++++++++++++++++---------------------------- 2 files changed, 102 insertions(+), 102 deletions(-) diff --git a/.gitignore b/.gitignore index ab5f993..728c11b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,6 @@ src/libinput-version.h doc/libinput.doxygen doc/html tags -test/test-* +test/*.test test/symbols-leak-test* test-driver diff --git a/test/Makefile.am b/test/Makefile.am index 231165c..acb2de7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -75,29 +75,29 @@ liblitest_la_CFLAGS += $(LIBUNWIND_CFLAGS) endif run_tests = \ - test-touchpad \ - test-touchpad-tap \ - test-touchpad-buttons \ - test-pad \ - test-tablet \ - test-device \ - test-gestures \ - test-pointer \ - test-touch \ - test-trackball \ - test-trackpoint \ - test-udev \ - test-path \ - test-log \ - test-misc \ - test-keyboard \ - test-litest-selftest + touchpad.test \ + touchpad-tap.test \ + touchpad-buttons.test \ + pad.test \ + tablet.test \ + device.test \ + gestures.test \ + pointer.test \ + touch.test \ + trackball.test \ + trackpoint.test \ + udev.test \ + path.test \ + log.test \ + misc.test \ + keyboard.test \ + litest-selftest.test build_tests = \ - test-build-cxx \ - test-build-linker \ - test-build-pedantic-c99 \ - test-build-std-gnuc90 + build-cxx.test \ + build-linker.test \ + build-pedantic-c99.test \ + build-std-gnuc90.test noinst_PROGRAMS = $(build_tests) $(run_tests) noinst_SCRIPTS = symbols-leak-test @@ -105,95 +105,95 @@ TESTS = $(run_tests) symbols-leak-test .NOTPARALLEL: -test_udev_SOURCES = udev.c -test_udev_LDADD = $(TEST_LIBS) -test_udev_LDFLAGS = -no-install - -test_path_SOURCES = path.c -test_path_LDADD = $(TEST_LIBS) -test_path_LDFLAGS = -no-install - -test_pointer_SOURCES = pointer.c -test_pointer_LDADD = $(TEST_LIBS) -test_pointer_LDFLAGS = -no-install - -test_touch_SOURCES = touch.c -test_touch_LDADD = $(TEST_LIBS) -test_touch_LDFLAGS = -no-install - -test_log_SOURCES = log.c -test_log_LDADD = $(TEST_LIBS) -test_log_LDFLAGS = -no-install - -test_tablet_SOURCES = tablet.c -test_tablet_LDADD = $(TEST_LIBS) -test_tablet_LDFLAGS = -static - -test_pad_SOURCES = pad.c -test_pad_LDADD = $(TEST_LIBS) -test_pad_LDFLAGS = -static - -test_touchpad_SOURCES = touchpad.c -test_touchpad_LDADD = $(TEST_LIBS) -test_touchpad_LDFLAGS = -no-install - -test_touchpad_tap_SOURCES = touchpad-tap.c -test_touchpad_tap_LDADD = $(TEST_LIBS) -test_touchpad_tap_LDFLAGS = -no-install - -test_touchpad_buttons_SOURCES = touchpad-buttons.c -test_touchpad_buttons_LDADD = $(TEST_LIBS) -test_touchpad_buttons_LDFLAGS = -no-install - -test_trackpoint_SOURCES = trackpoint.c -test_trackpoint_LDADD = $(TEST_LIBS) -test_trackpoint_LDFLAGS = -no-install - -test_trackball_SOURCES = trackball.c -test_trackball_LDADD = $(TEST_LIBS) -test_trackball_LDFLAGS = -no-install - -test_misc_SOURCES = misc.c -test_misc_CFLAGS= $(AM_CFLAGS) -DLIBINPUT_LT_VERSION="\"$(LIBINPUT_LT_VERSION)\"" -test_misc_LDADD = $(TEST_LIBS) -test_misc_LDFLAGS = -no-install - -test_keyboard_SOURCES = keyboard.c -test_keyboard_LDADD = $(TEST_LIBS) -test_keyboard_LDFLAGS = -no-install - -test_device_SOURCES = device.c -test_device_LDADD = $(TEST_LIBS) -test_device_LDFLAGS = -no-install - -test_gestures_SOURCES = gestures.c -test_gestures_LDADD = $(TEST_LIBS) -test_gestures_LDFLAGS = -no-install - -test_litest_selftest_SOURCES = litest-selftest.c litest.c litest-int.h litest.h -test_litest_selftest_CFLAGS = -DLITEST_DISABLE_BACKTRACE_LOGGING -DLITEST_NO_MAIN $(liblitest_la_CFLAGS) -test_litest_selftest_LDADD = $(TEST_LIBS) -test_litest_selftest_LDFLAGS = -no-install +udev_test_SOURCES = udev.c +udev_test_LDADD = $(TEST_LIBS) +udev_test_LDFLAGS = -no-install + +path_test_SOURCES = path.c +path_test_LDADD = $(TEST_LIBS) +path_test_LDFLAGS = -no-install + +pointer_test_SOURCES = pointer.c +pointer_test_LDADD = $(TEST_LIBS) +pointer_test_LDFLAGS = -no-install + +touch_test_SOURCES = touch.c +touch_test_LDADD = $(TEST_LIBS) +touch_test_LDFLAGS = -no-install + +log_test_SOURCES = log.c +log_test_LDADD = $(TEST_LIBS) +log_test_LDFLAGS = -no-install + +tablet_test_SOURCES = tablet.c +tablet_test_LDADD = $(TEST_LIBS) +tablet_test_LDFLAGS = -static + +pad_test_SOURCES = pad.c +pad_test_LDADD = $(TEST_LIBS) +pad_test_LDFLAGS = -static + +touchpad_test_SOURCES = touchpad.c +touchpad_test_LDADD = $(TEST_LIBS) +touchpad_test_LDFLAGS = -no-install + +touchpad_tap_test_SOURCES = touchpad-tap.c +touchpad_tap_test_LDADD = $(TEST_LIBS) +touchpad_tap_test_LDFLAGS = -no-install + +touchpad_buttons_test_SOURCES = touchpad-buttons.c +touchpad_buttons_test_LDADD = $(TEST_LIBS) +touchpad_buttons_test_LDFLAGS = -no-install + +trackpoint_test_SOURCES = trackpoint.c +trackpoint_test_LDADD = $(TEST_LIBS) +trackpoint_test_LDFLAGS = -no-install + +trackball_test_SOURCES = trackball.c +trackball_test_LDADD = $(TEST_LIBS) +trackball_test_LDFLAGS = -no-install + +misc_test_SOURCES = misc.c +misc_test_CFLAGS= $(AM_CFLAGS) -DLIBINPUT_LT_VERSION="\"$(LIBINPUT_LT_VERSION)\"" +misc_test_LDADD = $(TEST_LIBS) +misc_test_LDFLAGS = -no-install + +keyboard_test_SOURCES = keyboard.c +keyboard_test_LDADD = $(TEST_LIBS) +keyboard_test_LDFLAGS = -no-install + +device_test_SOURCES = device.c +device_test_LDADD = $(TEST_LIBS) +device_test_LDFLAGS = -no-install + +gestures_test_SOURCES = gestures.c +gestures_test_LDADD = $(TEST_LIBS) +gestures_test_LDFLAGS = -no-install + +litest_selftest_test_SOURCES = litest-selftest.c litest.c litest-int.h litest.h +litest_selftest_test_CFLAGS = -DLITEST_DISABLE_BACKTRACE_LOGGING -DLITEST_NO_MAIN $(liblitest_la_CFLAGS) +litest_selftest_test_LDADD = $(TEST_LIBS) +litest_selftest_test_LDFLAGS = -no-install if HAVE_LIBUNWIND -test_litest_selftest_LDADD += $(LIBUNWIND_LIBS) -ldl -test_litest_selftest_CFLAGS += $(LIBUNWIND_CFLAGS) +litest_selftest_test_LDADD += $(LIBUNWIND_LIBS) -ldl +litest_selftest_test_CFLAGS += $(LIBUNWIND_CFLAGS) endif # build-test only -test_build_pedantic_c99_SOURCES = build-pedantic.c -test_build_pedantic_c99_CFLAGS = -std=c99 -pedantic -Werror +build_pedantic_c99_test_SOURCES = build-pedantic.c +build_pedantic_c99_test_CFLAGS = -std=c99 -pedantic -Werror -test_build_std_gnuc90_SOURCES = build-pedantic.c -test_build_std_gnuc90_CFLAGS = -std=gnu90 -Werror +build_std_gnuc90_test_SOURCES = build-pedantic.c +build_std_gnuc90_test_CFLAGS = -std=gnu90 -Werror # test for linking with the minimal linker flags -test_build_linker_SOURCES = build-pedantic.c -test_build_linker_CFLAGS = -I$(top_srcdir)/src -test_build_linker_LDADD = $(top_builddir)/src/libinput.la $(top_builddir)/src/libinput-util.la +build_linker_test_SOURCES = build-pedantic.c +build_linker_test_CFLAGS = -I$(top_srcdir)/src +build_linker_test_LDADD = $(top_builddir)/src/libinput.la $(top_builddir)/src/libinput-util.la # test including from C++ -test_build_cxx_SOURCES = build-cxx.cc -test_build_cxx_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter $(AM_CXXFLAGS) +build_cxx_test_SOURCES = build-cxx.cc +build_cxx_test_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter $(AM_CXXFLAGS) AM_TESTS_ENVIRONMENT= LITEST_VERBOSE=1; export LITEST_VERBOSE; -- 2.7.4 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel