From 6f1ad230e5666eb30d4952cb84d7d49852ae4705 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 19 Jan 2012 13:21:11 +0100
Subject: Hook tests on 'make check' instead of 'make test'

This is how it's supposed to be done and so has the nice side effect of
actually using TESTS_ENVIRONMENT and so fix tests if EMPATHY_SRCDIR is not
defined.

https://bugzilla.gnome.org/show_bug.cgi?id=668186
---
 tests/Makefile.am | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7bcfa5e49..40bd8933c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,7 @@ LDADD =								\
 	$(EMPATHY_LIBS)						\
 	$(NULL)
 
-TEST_PROGS =                                     \
+TESTS =                                     \
      empathy-irc-server-test                     \
      empathy-irc-network-test                    \
      empathy-irc-network-manager-test            \
@@ -61,8 +61,6 @@ empathy_parser_test_SOURCES = empathy-parser-test.c \
 empathy_live_search_test_SOURCES = empathy-live-search-test.c \
      test-helper.c test-helper.h
 
-check_PROGRAMS = $(TEST_PROGS)
-
 TESTS_ENVIRONMENT = EMPATHY_SRCDIR=@abs_top_srcdir@ \
 		    MC_PROFILE_DIR=@abs_top_srcdir@/tests \
 		    MC_MANAGER_DIR=@abs_top_srcdir@/tests
@@ -71,10 +69,10 @@ test-report: test-report.xml
 	gtester-report $(top_builddir)/tests/$@.xml > \
 	  $(top_builddir)/tests/$@.html
 
-test-report.xml: ${TEST_PROGS} test
+test-report.xml: ${TESTS} test
 
-test: ${TEST_PROGS}
-	gtester -o test-report.xml -k --verbose ${TEST_PROGS}
+test: ${TESTS}
+	gtester -o test-report.xml -k --verbose ${TESTS}
 
 test-%: empathy-%-test
 	gtester -o $@-report.xml -k --verbose $<
-- 
cgit v1.2.3