From ecc6d6b19a9639ba12a3b16bcb9eed68f02604b5 Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Mon, 2 Jul 2012 15:40:35 -0700 Subject: Move integration tests from 'make check' to 'make integration-check' The integration tests have a variety of dependencies. Rather than require all the dependencies for a successful 'make check' test run, define a separate 'make integration-check' rule. Signed-off-by: Chase Douglas --- test/integration/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/Makefile.am b/test/integration/Makefile.am index ff9789ec9..8e0279967 100644 --- a/test/integration/Makefile.am +++ b/test/integration/Makefile.am @@ -1,15 +1,16 @@ -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 +all: gtest-tests + +integration-check: gtest-tests + ./gtest-tests endif endif -noinst_PROGRAMS = $(TESTS) +noinst_PROGRAMS = gtest-tests AM_CPPFLAGS = \ -DDEFAULT_XORG_SERVER=\"$(abs_top_builddir)/hw/xfree86/Xorg\" \ -- cgit v1.2.3