summaryrefslogtreecommitdiff
path: root/buildutil
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-04-28 13:04:14 +0200
committerAlexander Larsson <alexl@redhat.com>2016-04-28 13:04:14 +0200
commitb3303687615e88a1351cb7472402961956e26999 (patch)
treee611e4b39b692568b031b2106da2b45a89856d34 /buildutil
parent327f432219e767ac4f651dfa6b08ba030ec6e3e1 (diff)
downloadxdg-app-b3303687615e88a1351cb7472402961956e26999.tar.gz
Make installed tests work better
This involves e.g. having our own session bus with only our services in.
Diffstat (limited to 'buildutil')
-rw-r--r--buildutil/glib-tap.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk
index ac4329b..07a9c38 100644
--- a/buildutil/glib-tap.mk
+++ b/buildutil/glib-tap.mk
@@ -1,8 +1,8 @@
# GLIB - Library of useful C routines
TESTS_ENVIRONMENT= \
- G_TEST_SRCDIR="$(abs_srcdir)" \
- G_TEST_BUILDDIR="$(abs_builddir)" \
+ G_TEST_SRCDIR="$(abs_srcdir)/tests" \
+ G_TEST_BUILDDIR="$(abs_builddir)/tests" \
UNINSTALLEDTESTS=1 \
G_DEBUG=gc-friendly \
MALLOC_CHECK_=2 \
@@ -118,7 +118,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
%.test: %$(EXEEXT) Makefile
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
echo 'Type=session' >> $@.tmp; \
- echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<)' >> $@.tmp; \
+ echo 'Exec=env G_TEST_SRCDIR=$(installed_testdir) G_TEST_BUILDDIR=$(installed_testdir) $(installed_testdir)/$(notdir $<) --tap' >> $@.tmp; \
+ echo 'Output=TAP' >> $@.tmp; \
mv $@.tmp $@)
CLEANFILES += $(installed_test_meta_DATA)