summaryrefslogtreecommitdiff
path: root/libnm-glib
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-10-15 15:34:05 +0200
committerThomas Haller <thaller@redhat.com>2016-10-19 15:26:30 +0200
commitcd98705d215c139b41efbdf8409c57e2cf146bef (patch)
treeb48c7c4f0021d33aeed12f3de8f74cc2ac9a5828 /libnm-glib
parent274de2555baf30855501d3e275a09404ab03565a (diff)
downloadNetworkManager-cd98705d215c139b41efbdf8409c57e2cf146bef.tar.gz
tests: combine "run-test-valgrind.sh" and "run-test-dbus-session.sh" in "run-nm-test.sh"
No need to have two test-runners. Combine them, and call tests always via "tools/run-nm-test.sh". Yes, this brings an overhead, that we now always invoke the test with a test wrapper script, also --without-vagrind. Previously, that was only necessary for libnm tests that require their own D-Bus session. Later we will do non-recursive Makefiles, thus all tests should have the same LOG_COMPILER.
Diffstat (limited to 'libnm-glib')
-rw-r--r--libnm-glib/tests/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 4a51eba750..9d15802697 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -13,11 +13,7 @@ AM_CPPFLAGS = \
noinst_PROGRAMS = $(TESTS)
-if WITH_VALGRIND
@NM_LOG_COMPILER@ --launch-dbus
-else
-LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
-endif
TESTS = test-nm-client test-remote-settings-client
####### NMClient and non-settings tests #######