diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-05-14 14:39:23 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-05-26 13:51:44 +0200 |
| commit | d0e25ac8be339e4ddcae93978281493d6dee551c (patch) | |
| tree | 3cec2f0f69fade775e197752b48070418af2bc2a /tools | |
| parent | f627d6db8ececc70285bf858a6aee031a75a337a (diff) | |
| download | NetworkManager-d0e25ac8be339e4ddcae93978281493d6dee551c.tar.gz | |
tests: always spawn private d-bus
Parallel test runs would not be possible without this.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run-test-valgrind.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/run-test-valgrind.sh b/tools/run-test-valgrind.sh index 200a27d13c..f9f9646eb9 100755 --- a/tools/run-test-valgrind.sh +++ b/tools/run-test-valgrind.sh @@ -4,11 +4,9 @@ LIBTOOL="$1"; shift VALGRIND="$1"; shift SUPPRESSIONS="$1"; shift if [ "$1" = "--launch-dbus" ]; then - # Spawn DBus if there's none - if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `dbus-launch --sh-syntax` - trap "kill $DBUS_SESSION_BUS_PID" EXIT - fi + # Spawn DBus + eval `dbus-launch --sh-syntax` + trap "kill $DBUS_SESSION_BUS_PID" EXIT shift fi TEST="$1"; shift |