fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 18:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: merge branch 'th/tests-dbus-run-session'

Browse source 
Update build script to prefer dbus-run-session over dbus-launch.
This commit is contained in:
Thomas Haller 2016-01-22 17:03:33 +01:00
commit dfee5495e8
7 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnm-glib/tests/Makefile.am
View file

@ -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

7
libnm-glib/tests/libnm-glib-test-launch.sh
View file

@ -1,7 +0,0 @@
#!/bin/sh
# Spawn DBus
eval `dbus-launch --sh-syntax`
trap "kill $DBUS_SESSION_BUS_PID" EXIT
"$@"

4
libnm/tests/Makefile.am
View file

@ -21,7 +21,7 @@ noinst_PROGRAMS = $(TESTS)
if WITH_VALGRIND
@VALGRIND_RULES@ --launch-dbus
else
LOG_COMPILER = $(srcdir)/libnm-test-launch.sh
LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh
endif
TESTS = test-nm-client test-remote-settings-client test-secret-agent
@ -40,5 +40,3 @@ test_secret_agent_SOURCES = \
$(top_builddir)/shared/nm-test-libnm-utils.h \
test-secret-agent.c
endif
EXTRA_DIST = libnm-test-launch.sh

7
libnm/tests/libnm-test-launch.sh
View file

@ -1,7 +0,0 @@
#!/bin/sh
# Spawn DBus
eval `dbus-launch --sh-syntax`
trap "kill $DBUS_SESSION_BUS_PID" EXIT
"$@"

1
tools/Makefile.am
View file

@ -3,5 +3,6 @@ EXTRA_DIST = \
debug-helper.py \
doc-generator.xsl \
run-test-valgrind.sh \
run-test-dbus-session.sh \
test-networkmanager-service.py \
test-sudo-wrapper.sh

10
tools/run-test-dbus-session.sh Executable file
View file

@ -0,0 +1,10 @@
#!/bin/sh
if ! which dbus-run-session &>/dev/null; then
eval `dbus-launch --sh-syntax`
trap "kill $DBUS_SESSION_BUS_PID" EXIT
"$@"
exit $?
fi
dbus-run-session -- "$@"

11
tools/run-test-valgrind.sh
View file

@ -80,10 +80,14 @@ else
fi
fi
NMTST_DBUS_RUN_SESSION=()
if [ "$NMTST_LAUNCH_DBUS" == "yes" ]; then
# Spawn DBus
eval `dbus-launch --sh-syntax`
trap "kill $DBUS_SESSION_BUS_PID" EXIT
if ! which dbus-run-session &>/dev/null ; then
eval `dbus-launch --sh-syntax`
trap "kill $DBUS_SESSION_BUS_PID" EXIT
else
NMTST_DBUS_RUN_SESSION=(dbus-run-session --)
fi
fi
if [ "$NMTST_NO_VALGRIND" != "" ]; then
@ -95,6 +99,7 @@ LOGFILE="${TEST}.valgrind-log"
export G_SLICE=always-malloc
export G_DEBUG=gc-friendly
"${NMTST_DBUS_RUN_SESSION[@]}" \
"${NMTST_LIBTOOL[@]}" "$NMTST_VALGRIND" \
--quiet \
--error-exitcode=$VALGRIND_ERROR \