summaryrefslogtreecommitdiff
path: root/test/name-test
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-10-08 21:59:37 +0800
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-08 16:08:57 +0100
commit47df159cc5b82d29588749b4dafedde33a8a3470 (patch)
treec89c33de840a9751386f7349549a80394753e8ca /test/name-test
parent5b74af796c8f1d9f3f60594f22c6bfd4c097ad8b (diff)
downloaddbus-47df159cc5b82d29588749b4dafedde33a8a3470.tar.gz
Unify the way to find dbus-daemon test binary
There are two ways to find the dbus-daemon for testing. The first one is defined as string at compile stage and the second one is export it from test environment. The first way has limitation that after defined, it's static string, so it's impossible to run installable check. So let's unify to the second way. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37849 [added missing "}" -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'test/name-test')
-rw-r--r--test/name-test/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 931cb2c9..da41e58b 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -18,6 +18,7 @@ TESTS_ENVIRONMENT = \
DBUS_TOP_SRCDIR=@abs_top_srcdir@ \
PYTHON=@PYTHON@ \
DBUS_TEST_DATA=@abs_top_builddir@/test/data \
+ DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
$(NULL)
TESTS=run-test.sh run-test-systemserver.sh
else