From b3303687615e88a1351cb7472402961956e26999 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 28 Apr 2016 13:04:14 +0200
Subject: Make installed tests work better

This involves e.g. having our own session bus with only our services in.
---
 buildutil/glib-tap.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'buildutil')

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)
-- 
cgit v1.2.1