mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-01-02 14:30:14 +01:00
98ad8a8ec6
* glib/dbus-gobject.c (introspect_properties): fix the XML generated * dbus/dbus-message.c (dbus_message_unref): add an in_cache flag which effectively detects the use of freed messages * glib/dbus-gobject.c (handle_introspect): modify and return the reply message instead of the incoming message * dbus/dbus-object-tree.c (handle_default_introspect_unlocked): gee, maybe it should SEND THE XML instead of just making a string and freeing it again ;-) * tools/dbus-print-message.c (print_message): improve printing of messages * configure.in: add debug-glib.service to the output
90 lines
2.8 KiB
Bash
Executable file
90 lines
2.8 KiB
Bash
Executable file
#! /bin/bash
|
|
|
|
SCRIPTNAME=$0
|
|
MODE=$1
|
|
|
|
function die()
|
|
{
|
|
if ! test -z "$DBUS_SESSION_BUS_PID" ; then
|
|
echo "killing message bus "$DBUS_SESSION_BUS_PID
|
|
kill -9 $DBUS_SESSION_BUS_PID
|
|
fi
|
|
echo $SCRIPTNAME: $* >&2
|
|
exit 1
|
|
}
|
|
|
|
if test -z "$DBUS_TOP_BUILDDIR" ; then
|
|
die "Must set DBUS_TOP_BUILDDIR"
|
|
fi
|
|
|
|
## convenient to be able to ctrl+C without leaking the message bus process
|
|
trap 'die "Received SIGINT"' SIGINT
|
|
|
|
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>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
|
|
sed -e 's/<include.*$//g' \
|
|
> $CONFIG_FILE
|
|
|
|
echo "Created configuration file $CONFIG_FILE"
|
|
|
|
export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
|
|
## the libtool script found by the path search should already do this, but
|
|
export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
|
|
|
|
## will only do anything on Linux
|
|
export MALLOC_CHECK_=2
|
|
|
|
unset DBUS_SESSION_BUS_ADDRESS
|
|
unset DBUS_SESSION_BUS_PID
|
|
|
|
echo "Using daemon "`type dbus-daemon`
|
|
|
|
eval `$DBUS_TOP_BUILDDIR/tools/dbus-launch --sh-syntax --config-file=$CONFIG_FILE`
|
|
|
|
if test -z "$DBUS_SESSION_BUS_PID" ; then
|
|
die "Failed to launch message bus for tests to run"
|
|
fi
|
|
|
|
echo "Started test bus pid $DBUS_SESSION_BUS_PID at $DBUS_SESSION_BUS_ADDRESS"
|
|
|
|
## so the tests can complain if you fail to use the script to launch them
|
|
export DBUS_TEST_GLIB_RUN_TEST_SCRIPT=1
|
|
|
|
if test x$MODE = xprofile ; then
|
|
echo "profiling type $PROFILE_TYPE"
|
|
sleep 2 ## this lets the bus get started so its startup time doesn't affect the profile too much
|
|
if test x$PROFILE_TYPE = x ; then
|
|
PROFILE_TYPE=all
|
|
fi
|
|
libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/glib/test-profile $PROFILE_TYPE || die "test-profile failed"
|
|
elif test x$MODE = xviewer ; then
|
|
echo "Launching dbus-viewer"
|
|
ARGS=
|
|
if test x$DEBUG = x ; then
|
|
ARGS="--services org.freedesktop.DBus org.freedesktop.DBus.TestSuiteGLibService"
|
|
fi
|
|
libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/tools/dbus-viewer $ARGS || die "could not run dbus-viewer"
|
|
elif test x$MODE = xwait ; then
|
|
echo "Waiting DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
|
|
sleep 86400
|
|
else
|
|
echo "running test-dbus-glib"
|
|
libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/glib/test-dbus-glib || die "test-dbus-glib failed"
|
|
fi
|
|
|
|
## we kill -TERM so gcov data can be written out
|
|
|
|
kill -TERM $DBUS_SESSION_BUS_PID || die "Message bus vanished! should not have happened" && echo "Killed daemon $DBUS_SESSION_BUS_PID"
|
|
|
|
sleep 2
|
|
|
|
## be sure it really died
|
|
kill -9 $DBUS_SESSION_BUS_PID > /dev/null 2>&1 || true
|
|
|
|
exit 0
|