[PATCH 02/10] test: add integration-check target

[Peter Hutterer]

integration tests require a bit more effort than the other tests, so make it
run on a separate target.

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

diff --git a/Makefile.am b/Makefile.am
index cea140b..e1d5a86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,3 +95,6 @@ DIST_SUBDIRS = \
 # gross hack
 relink: all
 	$(AM_V_at)$(MAKE) -C hw relink
+
+integration-check: all
+	$(AM_V_AT)$(MAKE) -C test integration-check
diff --git a/test/Makefile.am b/test/Makefile.am
index aacd0c7..a2d1cb9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -118,3 +118,5 @@ endif
 
 EXTRA_DIST = ddxstubs.c
 
+integration-check: all
+	$(AM_V_AT)$(MAKE) -C integration integration-check
diff --git a/test/integration/Makefile.am b/test/integration/Makefile.am
index ff9789e..6109e23 100644
--- a/test/integration/Makefile.am
+++ b/test/integration/Makefile.am
@@ -1,15 +1,18 @@
-TESTS =
+integration_tests =
 
 if ENABLE_XORG_GTEST_TESTS
 include $(top_srcdir)/test/integration/Makefile-xorg-gtest.am
 noinst_LIBRARIES = $(XORG_GTEST_BUILD_LIBS)
 
 if ENABLE_XORG_GTEST_INPUT_TESTS
-TESTS += gtest-tests
+integration_tests += gtest-tests
 endif
 endif
 
-noinst_PROGRAMS = $(TESTS)
+noinst_PROGRAMS = $(integration_tests)
+
+integration-check: $(integration_tests)
+	$(AM_V_AT)for test in $(integration_tests); do $(builddir)/$$test; done
 
 AM_CPPFLAGS = \
 	-DDEFAULT_XORG_SERVER=\"$(abs_top_builddir)/hw/xfree86/Xorg\" \
-- 
1.7.10.4