[PATCH 04/10] test/integration: split input driver test from xi2 test

Peter Hutterer peter.hutterer at who-t.net
Mon Jul 2 23:59:21 PDT 2012


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 test/integration/Makefile.am |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/integration/Makefile.am b/test/integration/Makefile.am
index 4b02463..eefcbe5 100644
--- a/test/integration/Makefile.am
+++ b/test/integration/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/test/integration/Makefile-xorg-gtest.am
 noinst_LIBRARIES = $(XORG_GTEST_BUILD_LIBS)
 
 if ENABLE_XORG_GTEST_INPUT_TESTS
-integration_tests += gtest-tests
+integration_tests += xi2-gtest input-driver-gtest
 endif
 endif
 
@@ -22,10 +22,15 @@ AM_CPPFLAGS = \
 
 AM_CXXFLAGS = $(GTEST_CXXFLAGS) $(XORG_GTEST_CXXFLAGS)
 
-gtest_tests_SOURCES = xi2.cpp input_drivers.cpp
-gtest_tests_LDADD = \
+GTEST_LDADDS = \
 	$(TEST_XINPUT_LIBS) \
 	$(TEST_X11_LIBS) \
 	$(XORG_GTEST_LIBS) \
 	$(EVEMU_LIBS) \
 	$(XORG_GTEST_MAIN_LIBS)
+
+xi2_gtest_SOURCES = xi2.cpp
+xi2_gtest_LDADD = $(GTEST_LDADDS)
+
+input_driver_gtest_SOURCES = input_drivers.cpp
+input_driver_gtest_LDADD = $(GTEST_LDADDS)
-- 
1.7.10.4



More information about the xorg-devel mailing list