mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-25 00:00:17 +01:00
run-with-tmp-session-bus.sh: create a unique temporary file per process
This makes the regression tests OK to run in parallel. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
parent
30e7a81302
commit
9d80d46a79
2 changed files with 10 additions and 3 deletions
2
test/name-test/.gitignore
vendored
2
test/name-test/.gitignore
vendored
|
|
@ -3,7 +3,7 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
echo-error-output.tmp
|
||||
run-with-tmp-session-bus.conf
|
||||
tmp-session-bus.*.conf
|
||||
test-ids
|
||||
test-names
|
||||
test-pending-call-dispatch
|
||||
|
|
|
|||
|
|
@ -4,9 +4,12 @@ SCRIPTNAME="$0"
|
|||
WRAPPED_SCRIPT="$1"
|
||||
shift
|
||||
|
||||
CONFIG_FILE=./tmp-session-bus.$$.conf
|
||||
|
||||
die ()
|
||||
{
|
||||
echo "$SCRIPTNAME: $*" >&2
|
||||
rm -f "$CONFIG_FILE"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
|
@ -14,7 +17,6 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then
|
|||
die "Must set DBUS_TOP_BUILDDIR"
|
||||
fi
|
||||
|
||||
CONFIG_FILE=./run-with-tmp-session-bus.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" >&2
|
||||
|
|
@ -48,8 +50,13 @@ unset DBUS_SESSION_BUS_PID
|
|||
DBUS_USE_TEST_BINARY=1
|
||||
export DBUS_USE_TEST_BINARY
|
||||
|
||||
exec $DBUS_TOP_BUILDDIR/tools/dbus-run-session \
|
||||
$DBUS_TOP_BUILDDIR/tools/dbus-run-session \
|
||||
--config-file="$CONFIG_FILE" \
|
||||
--dbus-daemon="$DBUS_TOP_BUILDDIR/bus/dbus-daemon" \
|
||||
-- \
|
||||
"$WRAPPED_SCRIPT" "$@"
|
||||
error=$?
|
||||
|
||||
# clean up
|
||||
rm -f "$CONFIG_FILE"
|
||||
exit $error
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue