diff options
Diffstat (limited to 'test/run-with-tmp-session-bus.sh')
| -rwxr-xr-x | test/run-with-tmp-session-bus.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/test/run-with-tmp-session-bus.sh b/test/run-with-tmp-session-bus.sh index e767f2d..48f48b0 100755 --- a/test/run-with-tmp-session-bus.sh +++ b/test/run-with-tmp-session-bus.sh @@ -47,6 +47,8 @@ trap 'die "Received SIGINT"' SIGINT CONFIG_FILE="$DBUS_TOP_BUILDDIR"/test/tmp-session-bus.conf +unset DBUS_STARTER_ADDRESS +unset DBUS_STARTER_BUS_TYPE unset DBUS_SESSION_BUS_ADDRESS unset DBUS_SESSION_BUS_PID @@ -61,7 +63,19 @@ echo "Started bus pid $DBUS_SESSION_BUS_PID at $DBUS_SESSION_BUS_ADDRESS" >&2 # Execute wrapped script echo "Running: $WRAPPED_SCRIPT $*" >&2 -"$WRAPPED_SCRIPT" "$@" || die "script \"$WRAPPED_SCRIPT\" failed" +"$WRAPPED_SCRIPT" "$@" +e=$? + +case "$e" in + (77) + echo "script \"$WRAPPED_SCRIPT\" skipped" >&2 + ;; + (0) + ;; + (*) + die "script \"$WRAPPED_SCRIPT\" failed" + ;; +esac kill -TERM "$DBUS_SESSION_BUS_PID" \ || die "Message bus vanished! should not have happened" \ |