diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-10-16 06:34:51 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-10-16 06:34:51 +0000 |
| commit | d6e1b2adb3d8e51ce1bb47295cef12d9fe1a15a8 (patch) | |
| tree | d94b220a2886b384ddc4f55df4689d79430a6399 /test/glib/run-test.sh | |
| parent | 9b9dd4b80eb2753fc67bed1f48eef89674ba968e (diff) | |
2003-10-16 Havoc Pennington <hp@redhat.com>
* bus/connection.c (bus_pending_reply_expired): either cancel or
execute, not both
(bus_connections_check_reply): use unlink, not remove_link, as we
don't want to free the link; fixes double free mess
* dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case
where no reply was received
* dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock):
fix a refcount leak
* bus/signals.c (match_rule_matches): add special cases for the
bus driver, so you can match on sender/destination for it.
* dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if
DBUS_PRINT_BACKTRACE is set
* dbus/dbus-internals.c: add pid to assertion failure messages
* dbus/dbus-connection.c: add message type code to the debug spew
* glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want
sender=foo not service=foo
* dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the
session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use
DBUS_ACTIVATION_ADDRESS instead
* bus/activation.c: set DBUS_SESSION_BUS_ADDRESS,
DBUS_SYSTEM_BUS_ADDRESS if appropriate
* bus/bus.c (bus_context_new): handle OOM copying bus type into
context struct
* dbus/dbus-message.c (dbus_message_iter_get_object_path): new function
(dbus_message_iter_get_object_path_array): new function (half
finished, disabled for the moment)
* glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle
DBUS_MESSAGE_TYPE_ERROR
* tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to
avoid redirecting stderr to /dev/null
(babysit): close stdin if not doing the "exit_with_session" thing
* dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover
debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not
stdout/stdin, so things don't get confused
* bus/system.conf.in: fix to allow replies, I modified .conf
instead of .conf.in again.
Diffstat (limited to 'test/glib/run-test.sh')
| -rwxr-xr-x | test/glib/run-test.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/glib/run-test.sh b/test/glib/run-test.sh index ccbb9a4a..a51396bb 100755 --- a/test/glib/run-test.sh +++ b/test/glib/run-test.sh @@ -4,6 +4,9 @@ SCRIPTNAME=$0 function die() { + if ! test -z "$DBUS_SESSION_BUS_PID" ; then + kill -9 $DBUS_SESSION_BUS_PID + fi echo $SCRIPTNAME: $* >&2 exit 1 } @@ -13,11 +16,14 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then fi CONFIG_FILE=./run-test.conf +SERVICE_DIR="$DBUS_TOP_BUILDDIR/test/data/valid-service-files" +ESCAPED_SERVICE_DIR=`echo $SERVICE_DIR | sed -e 's/\//\\\\\\//g'` +echo "escaped service dir is: $ESCAPED_SERVICE_DIR" ## create a configuration file based on the standard session.conf cat $DBUS_TOP_BUILDDIR/bus/session.conf | \ - sed -e 's/<servicedir>.*$//g' | \ - sed -e 's/<include.*$//g' \ + sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ + sed -e 's/<include.*$//g' \ > $CONFIG_FILE echo "Created configuration file $CONFIG_FILE" |