diff options
| author | Simon McVittie <smcv@debian.org> | 2016-08-12 11:12:59 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-08-12 18:13:47 +0100 |
| commit | 67f2fed1fda147a9ac02d55d6e85013d02c355d2 (patch) | |
| tree | f5e58045311e0cdc7000a3a4861181d81cd00230 /test/test-dbus-launch-x11.sh | |
| parent | 01ffa21501070a26c20f8fe58a9fd7d8c7691b39 (diff) | |
| download | dbus-67f2fed1fda147a9ac02d55d6e85013d02c355d2.tar.gz | |
test-dbus-launch-x11: extend to cover --exit-with-x11
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'test/test-dbus-launch-x11.sh')
| -rwxr-xr-x | test/test-dbus-launch-x11.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/test-dbus-launch-x11.sh b/test/test-dbus-launch-x11.sh index c52a7583..be0f4f3c 100755 --- a/test/test-dbus-launch-x11.sh +++ b/test/test-dbus-launch-x11.sh @@ -126,12 +126,13 @@ test_disconnection () { } test_exit_with_x11 () { + arg="$1" unset DBUS_SESSION_BUS_ADDRESS unset DBUS_SESSION_BUS_PID unset DBUS_SESSION_BUS_WINDOWID start_xvfb - eval "$($DBUS_TEST_DBUS_LAUNCH --sh-syntax --exit-with-session "$launch_config" </dev/null)" + eval "$($DBUS_TEST_DBUS_LAUNCH --sh-syntax "$arg" "$launch_config" </dev/null)" test -n "$DBUS_SESSION_BUS_ADDRESS" env | grep '^DBUS_SESSION_BUS_ADDRESS=' @@ -149,7 +150,7 @@ test_exit_with_x11 () { test_disconnection test_num=$(($test_num + 1)) - echo "ok ${test_num} - dbus-launch --exit-with-session" + echo "ok ${test_num} - dbus-launch $arg" } test_autolaunch () { @@ -246,8 +247,9 @@ test_xdg_runtime_dir () { echo "ok ${test_num} - dbus-launch --autolaunch with XDG_RUNTIME_DIR" } -echo "1..3" -test_exit_with_x11 +echo "1..4" +test_exit_with_x11 --exit-with-session +test_exit_with_x11 --exit-with-x11 test_autolaunch test_xdg_runtime_dir |