diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-09-13 16:56:26 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-13 14:29:45 +0100 |
| commit | ee0f28f6a575337fe6d0571f5935f82a601c37c9 (patch) | |
| tree | 7d2bd64649ef210648f04c96d5985ec9c97a5a8d /test/name-test | |
| parent | 2cf320fc82593fd1b3c71688f770e443366780ec (diff) | |
| download | dbus-ee0f28f6a575337fe6d0571f5935f82a601c37c9.tar.gz dbus-ee0f28f6a575337fe6d0571f5935f82a601c37c9.tar.bz2 dbus-ee0f28f6a575337fe6d0571f5935f82a601c37c9.zip | |
Use test binaries in build dir to do test
When do autolaunch testing, libdbus will try to start dbus-launch in
installed direcotry, if fail then fall back to dbus-launch in $PATH.
dbus-launch does a relative better thing to start dbus-daemon in build
directory, however, in most of case, the build $prefix is different from
the real prefix where dbus-daemon installed. So dbus-daemon will fail to
start due to can't find its config file. And then dbus-launch will fall
back to finally the installed dbus-daemon.
This patch fix this behavior and will start dbus-launch and dbus-daemon
in build directory in test environment.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37849
Diffstat (limited to 'test/name-test')
| -rw-r--r-- | test/name-test/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 54b02af0..931cb2c9 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -13,7 +13,12 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ ## so if adding tests not to be run in make check, don't add them to ## TESTS if DBUS_ENABLE_EMBEDDED_TESTS -TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@ PYTHON=@PYTHON@ +TESTS_ENVIRONMENT = \ + DBUS_TOP_BUILDDIR=@abs_top_builddir@ \ + DBUS_TOP_SRCDIR=@abs_top_srcdir@ \ + PYTHON=@PYTHON@ \ + DBUS_TEST_DATA=@abs_top_builddir@/test/data \ + $(NULL) TESTS=run-test.sh run-test-systemserver.sh else TESTS= |