summaryrefslogtreecommitdiff
path: root/libnm-glib
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-01-22 15:49:05 +0100
committerThomas Haller <thaller@redhat.com>2016-01-22 16:52:41 +0100
commit5170d3a760bf423468e1c9639eaa04ce8f4f940e (patch)
tree3c252350a89ffdd440ae9dd3b065e3fb62811ab3 /libnm-glib
parenta9bd5dce1cb0471c408b83814479051789beeff2 (diff)
downloadNetworkManager-5170d3a760bf423468e1c9639eaa04ce8f4f940e.tar.gz
tests: move common dbus test-runners to tools/ directory
Diffstat (limited to 'libnm-glib')
-rw-r--r--libnm-glib/tests/Makefile.am4
-rwxr-xr-xlibnm-glib/tests/libnm-glib-test-launch.sh3
2 files changed, 1 insertions, 6 deletions
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index a1b25f62f4..138b2b320e 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -17,7 +17,7 @@ noinst_PROGRAMS = $(TESTS)
if WITH_VALGRIND
@VALGRIND_RULES@ --launch-dbus
else
-LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh
+LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
endif
TESTS = test-nm-client test-remote-settings-client
@@ -50,5 +50,3 @@ test_remote_settings_client_LDADD = \
###########################################
endif
-
-EXTRA_DIST = libnm-glib-test-launch.sh
diff --git a/libnm-glib/tests/libnm-glib-test-launch.sh b/libnm-glib/tests/libnm-glib-test-launch.sh
deleted file mode 100755
index 1064e41223..0000000000
--- a/libnm-glib/tests/libnm-glib-test-launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-dbus-run-session -- "$@"