aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-01-19 20:21:11 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-19 22:42:54 +0800
commit6f1ad230e5666eb30d4952cb84d7d49852ae4705 (patch)
tree4edb47dd5b4ae0fe3658ed8678e178e55f90016b /tests
parent5cec6527d47562cc0e8fee9e525ed7fa2e3f680b (diff)
downloadgsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.tar
gsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.tar.gz
gsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.tar.bz2
gsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.tar.lz
gsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.tar.xz
gsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.tar.zst
gsoc2013-empathy-6f1ad230e5666eb30d4952cb84d7d49852ae4705.zip
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
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am10
1 files changed, 4 insertions, 6 deletions
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 $<