From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Thu, 14 Oct 2010 20:38:05 +0000 (-0700)
Subject: Set up tests with ENVIRONMENT, not wrapper scripts.
X-Git-Tag: FOLKS_0_3_1~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd73fcb091f2fe57b53ddebc0f8b5ed007c3c5e8;p=platform%2Fupstream%2Ffolks.git

Set up tests with ENVIRONMENT, not wrapper scripts.
---

diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index c257088..9d588f2 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -48,9 +48,13 @@ noinst_PROGRAMS = \
 	individual-properties \
 	$(NULL)
 
+SESSION_CONF = $(top_builddir)/tests/lib/telepathy/contactlist/session.conf
 TESTS_ENVIRONMENT = \
-	FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini
-TESTS = $(addprefix test-,$(noinst_PROGRAMS))
+	FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini \
+	$(RUN_WITH_PRIVATE_BUS) \
+	--config-file=$(SESSION_CONF) \
+	--
+TESTS = $(noinst_PROGRAMS)
 
 persona_store_capabilities_SOURCES = \
 	persona-store-capabilities.vala \
@@ -72,11 +76,4 @@ CLEANFILES = \
 	$(TESTS) \
 	$(NULL)
 
-test-%: %
-	{ echo "#!/bin/sh" && \
-	echo -n "$(RUN_WITH_PRIVATE_BUS) " && \
-	echo "--config-file=$(top_builddir)/tests/lib/telepathy/contactlist/session.conf -- ./$<"; } \
-	> $@
-	chmod +x $@
-
 -include $(top_srcdir)/git.mk