Skip to content

Commit 51c37e7

Browse files
committed
Use temp file in dbus_wrapper.sh for test
This should allow test to be run in parallel.
1 parent d1f2dfe commit 51c37e7

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

test/dbus_wrapper.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,30 @@ finish()
55
if [ -n "$DBUS_SESSION_BUS_PID" ]; then
66
kill "$DBUS_SESSION_BUS_PID" || exit 1
77
fi
8-
rm -f dbus-session-bus-pid
9-
rm -f dbus-session-bus-address
8+
if [ -n "$ADDRESS_FILE" ]; then
9+
rm -f -- "$ADDRESS_FILE"
10+
fi
11+
if [ -n "$PID_FILE" ]; then
12+
rm -f -- "$PID_FILE"
13+
fi
1014
}
1115

16+
ADDRESS_FILE=
17+
PID_FILE=
18+
1219
trap finish EXIT
20+
21+
ADDRESS_FILE=$(mktemp -p "$PWD" dbus-session-bus-address.XXXXXX)
22+
PID_FILE=$(mktemp -p "$PWD" dbus-session-bus-pid.XXXXXX)
23+
1324
DBUS_DAEMON=$1
1425
shift
1526

1627
"$DBUS_DAEMON" --fork --session --print-address=3 --print-pid=4 \
17-
3> dbus-session-bus-address 4> dbus-session-bus-pid || exit 1
28+
3> "$ADDRESS_FILE" 4> "$PID_FILE" || exit 1
1829

19-
DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
20-
DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
30+
DBUS_SESSION_BUS_ADDRESS=$(cat "$ADDRESS_FILE")
31+
DBUS_SESSION_BUS_PID=$(cat "$PID_FILE")
2132

2233
export DBUS_SESSION_BUS_ADDRESS
2334

0 commit comments

Comments
 (0)