[Full path to the daemon in the builddir])
AC_SUBST(TEST_BUS_BINARY)
+AC_DEFINE_UNQUOTED(TEST_BUS_LAUNCH_BINARY, ["$DBUS_PWD/tools/dbus-launch$EXEEXT"],
+ [Full path to the dbus-launch in the builddir])
+
## Export the non-setuid external helper
TEST_LAUNCH_HELPER_BINARY="$DBUS_PWD/bus/dbus-daemon-launch-helper-test$EXEEXT"
AC_SUBST(TEST_LAUNCH_HELPER_BINARY)
}
i = 0;
- argv[i] = "dbus-launch";
+#ifdef DBUS_ENABLE_EMBEDDED_TESTS
+ if (_dbus_getenv ("DBUS_USE_TEST_BINARY") != NULL)
+ argv[i] = TEST_BUS_LAUNCH_BINARY;
+ else
+#endif
+ argv[i] = DBUS_BINDIR "/dbus-launch";
++i;
argv[i] = "--autolaunch";
++i;
_dbus_assert (i == _DBUS_N_ELEMENTS (argv));
- retval = _read_subprocess_line_argv (DBUS_BINDIR "/dbus-launch",
+ retval = _read_subprocess_line_argv (argv[0],
TRUE,
argv, address, error);
## 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=
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
/* exec from testdir */
- if (getenv("DBUS_USE_TEST_BINARY") != NULL)
+ if (getenv ("DBUS_USE_TEST_BINARY") != NULL)
{
+ if (config_file == NULL && getenv ("DBUS_TEST_DATA") != NULL)
+ {
+ ret = asprintf (&config_file, "%s/valid-config-files/session.conf",
+ getenv ("DBUS_TEST_DATA"));
+ }
+ if (ret == -1 && config_file != NULL)
+ free (config_file);
+
execl (TEST_BUS_BINARY,
TEST_BUS_BINARY,
"--fork",