Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- test/Makefile.am | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/test/Makefile.am b/test/Makefile.am index f58faed..aacd0c7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,10 +1,11 @@ +SUBDIRS = if ENABLE_UNIT_TESTS -SUBDIRS= . +SUBDIRS += . noinst_PROGRAMS = list string touch if XORG # Tests that require at least some DDX functions in order to fully link # For now, requires xf86 ddx, could be adjusted to use another -SUBDIRS += xi2 integration +SUBDIRS += xi2 noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest endif check_LTLIBRARIES = libxservertest.la @@ -110,5 +111,10 @@ endif libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD) endif +if ENABLE_INTEGRATION_TESTS +SUBDIRS += integration +endif + + EXTRA_DIST = ddxstubs.c -- 1.7.10.4 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel