diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-21 23:21:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-21 23:21:24 +0100 |
| commit | 3d5f78e8440501f349ddc5f6fc1135c581deb99c (patch) | |
| tree | 23bd7af6e48a884e7962e542a5315522b9ed7adb | |
| parent | a3c17353d7fc78758f0a56b4507029135f5cc9b6 (diff) | |
Use dbus-run-session instead of dbus-launch within the test suite
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/tests-use-dbus-run-session-instead-of-dbus-launch.patch | 39 |
3 files changed, 41 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ea8e3531..f6615026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ network-manager (1.1.90-2) UNRELEASED; urgency=medium * Update debian/copyright. * Clean up obsolete /etc/dbus-1/system.d/nm-avahi-autoipd.conf conffile on upgrades. + * Use dbus-run-session instead of dbus-launch within the test suite. -- Michael Biebl <biebl@debian.org> Thu, 21 Jan 2016 18:08:37 +0100 diff --git a/debian/patches/series b/debian/patches/series index 1421fe24..4cd21f84 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ Don-t-make-NetworkManager-D-Bus-activatable.patch Don-t-block-network.target-on-NetworkManager-wait-on.patch Fix-iscsiadm-path.patch libnm-vpn-restore-export-of-deprecated-NMVpnPluginOld-sym.patch +tests-use-dbus-run-session-instead-of-dbus-launch.patch diff --git a/debian/patches/tests-use-dbus-run-session-instead-of-dbus-launch.patch b/debian/patches/tests-use-dbus-run-session-instead-of-dbus-launch.patch new file mode 100644 index 00000000..a95b8e2c --- /dev/null +++ b/debian/patches/tests-use-dbus-run-session-instead-of-dbus-launch.patch @@ -0,0 +1,39 @@ +From: Michael Biebl <biebl@debian.org> +Date: Thu, 21 Jan 2016 23:11:29 +0100 +Subject: tests: use dbus-run-session instead of dbus-launch + +The dbus-run-session utility was designed to run a process within a +D-Bus session, specifically for running regressions tests and is much +better suited then dbus-launch. As an additional benefit, this avoids +any X dependencies. +--- + libnm-glib/tests/libnm-glib-test-launch.sh | 6 +----- + libnm/tests/libnm-test-launch.sh | 6 +----- + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/libnm-glib/tests/libnm-glib-test-launch.sh b/libnm-glib/tests/libnm-glib-test-launch.sh +index 980f834..1064e41 100755 +--- a/libnm-glib/tests/libnm-glib-test-launch.sh ++++ b/libnm-glib/tests/libnm-glib-test-launch.sh +@@ -1,7 +1,3 @@ + #!/bin/sh + +-# Spawn DBus +-eval `dbus-launch --sh-syntax` +-trap "kill $DBUS_SESSION_BUS_PID" EXIT +- +-"$@" ++dbus-run-session -- "$@" +diff --git a/libnm/tests/libnm-test-launch.sh b/libnm/tests/libnm-test-launch.sh +index 980f834..1064e41 100755 +--- a/libnm/tests/libnm-test-launch.sh ++++ b/libnm/tests/libnm-test-launch.sh +@@ -1,7 +1,3 @@ + #!/bin/sh + +-# Spawn DBus +-eval `dbus-launch --sh-syntax` +-trap "kill $DBUS_SESSION_BUS_PID" EXIT +- +-"$@" ++dbus-run-session -- "$@" |