From e685fa4eed5c4fcbc469e3ebe2a9c6562c91b057 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 17 Jun 2009 16:36:17 -0500
Subject: The new dbus-test-runner has parameters.  So now we're changing the
 server to take the json parameter and the file.

---
 tests/Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e566594..2ec6ca7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -84,8 +84,8 @@ test_glib_properties_client_LDADD = \
 
 
 
-test-gtk-label: test-gtk-label-client test-gtk-label-server
-	$(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --task-name Server --ignore-return
+test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json
+	$(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return
 
 test_gtk_label_server_SOURCES = \
 	test-gtk-label-server.c
@@ -124,4 +124,6 @@ examplesdir = $(docdir)/examples/
 examples_DATA = \
 	$(glib_server_nomenu_SOURCES)
 
-EXTRA_DIST = $(examples_DATA)
+EXTRA_DIST = \
+	$(examples_DATA) \
+	test-gtk-label.json
-- 
cgit v1.2.3