diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
| commit | c2de0d98ba39e0a1a970d066fd19be786092f376 (patch) | |
| tree | 3838363c06a6019db6cf1f882ea34ebded63c38b /libnm-glib/tests | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'libnm-glib/tests')
| -rw-r--r-- | libnm-glib/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | libnm-glib/tests/Makefile.in | 7 | ||||
| -rwxr-xr-x | libnm-glib/tests/libnm-glib-test-launch.sh | 7 | ||||
| -rw-r--r-- | libnm-glib/tests/test-nm-client.c | 3 | ||||
| -rw-r--r-- | libnm-glib/tests/test-remote-settings-client.c | 4 |
5 files changed, 6 insertions, 19 deletions
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index a1b25f62..138b2b32 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/Makefile.in b/libnm-glib/tests/Makefile.in index 8d7e6dea..d1201dce 100644 --- a/libnm-glib/tests/Makefile.in +++ b/libnm-glib/tests/Makefile.in @@ -689,7 +689,7 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) -@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh +@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh ####### NMClient and non-settings tests ####### @ENABLE_TESTS_TRUE@test_nm_client_SOURCES = \ @@ -716,9 +716,6 @@ with_valgrind = @with_valgrind@ @ENABLE_TESTS_TRUE@ $(GLIB_LIBS) \ @ENABLE_TESTS_TRUE@ $(DBUS_LIBS) - -########################################### -EXTRA_DIST = libnm-glib-test-launch.sh all: all-am .SUFFIXES: @@ -1203,6 +1200,8 @@ uninstall-am: @ENABLE_TESTS_TRUE@@WITH_VALGRIND_TRUE@@VALGRIND_RULES@ --launch-dbus +########################################### + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: 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 980f8345..00000000 --- a/libnm-glib/tests/libnm-glib-test-launch.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Spawn DBus -eval `dbus-launch --sh-syntax` -trap "kill $DBUS_SESSION_BUS_PID" EXIT - -"$@" diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index f528bc26..da2e39e0 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -27,7 +27,6 @@ #include <sys/types.h> #include <signal.h> -#include "nm-default.h" #include "nm-client.h" #include "nm-device-wifi.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 83227d4b..9213aa72 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -28,12 +28,10 @@ #include <signal.h> #include "NetworkManager.h" - #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-utils.h" -#include "nm-default.h" #include "nm-remote-settings.h" #include "nm-test-libnm-utils.h" |