From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Aug 2016 10:12:59 +0000 (+0100)
Subject: test-dbus-launch-x11: extend to cover --exit-with-x11
X-Git-Tag: dbus-1.11.4~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67f2fed1fda147a9ac02d55d6e85013d02c355d2;p=thirdparty%2Fdbus.git

test-dbus-launch-x11: extend to cover --exit-with-x11

Signed-off-by: Simon McVittie <smcv@debian.org>
---

diff --git a/test/test-dbus-launch-x11.sh b/test/test-dbus-launch-x11.sh
index c52a7583f..be0f4f3c4 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