Attachment 85109 Details for Bug 68852 – run-with-tmp-session-bus.sh: create a unique temporary file per process

[patch] run-with-tmp-session-bus.sh: create a unique temporary file per process

0001-run-with-tmp-session-bus.sh-create-a-unique-temporar.patch (text/plain), 1.87 KB, created by Simon McVittie on 2013-09-03 11:29:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-03 11:29:39 UTC

Size: 1.87 KB

patch

obsolete

>From d695c2a788a1e89468b82f99ad2e3048f8fa25e9 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 3 Sep 2013 12:25:31 +0100
>Subject: [PATCH 1/4] run-with-tmp-session-bus.sh: create a unique temporary
> file per process
>
>This makes the regression tests OK to run in parallel.
>---
> test/name-test/.gitignore         |  2 +-
> tools/run-with-tmp-session-bus.sh | 11 +++++++++--
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore
>index 09f7ad3..2bf313a 100644
>--- a/test/name-test/.gitignore
>+++ b/test/name-test/.gitignore
>@@ -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
>diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh
>index 3245652..94ae8fc 100755
>--- a/tools/run-with-tmp-session-bus.sh
>+++ b/tools/run-with-tmp-session-bus.sh
>@@ -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
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68852: 85071 | 85072 | 85073 | 85074 | 85076 | 85077 | 85082 | 85109 | 85110 | 85240 | 85604

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.