From 3ba3fcb0b363c8cf9a077f453db816fa568d2fb3 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Fri, 13 Sep 2013 17:11:29 +0800 Subject: [PATCH 2/2] 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. Let's just use the first one and remove the second. --- test/Makefile.am | 2 -- test/dbus-daemon-eavesdrop.c | 2 +- test/dbus-daemon.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index eddcd64..ec41a48 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -149,14 +149,12 @@ endif DBUS_WITH_GLIB installcheck_tests = installcheck_environment = \ - DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \ DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) TESTS_ENVIRONMENT = \ DBUS_BLOCK_ON_ABORT=1 \ DBUS_FATAL_WARNINGS=1 \ - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ DBUS_TEST_DATA=@abs_top_builddir@/test/data \ DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ $(NULL) diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c index 2c45f54..d43f88e 100644 --- a/test/dbus-daemon-eavesdrop.c +++ b/test/dbus-daemon-eavesdrop.c @@ -388,7 +388,7 @@ setup (Fixture *f, f->ge = NULL; dbus_error_init (&f->e); - dbus_daemon = g_strdup (g_getenv ("DBUS_TEST_DAEMON")); + dbus_daemon = g_strdup (TEST_BUS_BINARY); if (dbus_daemon == NULL) dbus_daemon = g_strdup ("dbus-daemon"); diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c index 22ea23e..1cb0417 100644 --- a/test/dbus-daemon.c +++ b/test/dbus-daemon.c @@ -222,7 +222,7 @@ setup (Fixture *f, arg = g_strdup ("--session"); } - dbus_daemon = g_strdup (g_getenv ("DBUS_TEST_DAEMON")); + dbus_daemon = g_strdup (TEST_BUS_BINARY); if (dbus_daemon == NULL) dbus_daemon = g_strdup ("dbus-daemon"); -- 1.7.9.5