diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 24 | ||||
| -rwxr-xr-x | tools/run-test-valgrind.sh | 20 | ||||
| -rwxr-xr-x | tools/test-networkmanager-service.py | 26 |
3 files changed, 48 insertions, 22 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index cab82382..626bf6a3 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tools -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -95,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -119,6 +129,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -145,7 +156,6 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@ DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@ @@ -180,6 +190,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -403,7 +414,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tools/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -578,6 +588,8 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # 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. diff --git a/tools/run-test-valgrind.sh b/tools/run-test-valgrind.sh index 506fff75..200a27d1 100755 --- a/tools/run-test-valgrind.sh +++ b/tools/run-test-valgrind.sh @@ -3,8 +3,21 @@ 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 + shift +fi TEST="$1"; shift +if [ "$NMTST_NO_VALGRIND" != "" ]; then + "$TEST" + exit $? +fi + LOGFILE="valgrind-`echo "$TEST" | tr -cd '[:alpha:]-'`.log" export G_SLICE=always-malloc @@ -19,7 +32,12 @@ $LIBTOOL --mode=execute "$VALGRIND" \ "$TEST" RESULT=$? -if [ $RESULT -ne 0 ]; then +if [ $RESULT -eq 0 -a "$(wc -c "$LOGFILE" | awk '{print$1}')" -ne 0 ]; then + echo "valgrind succeeded, but log is not empty: $LOGFILE" + exit 1 +fi + +if [ $RESULT -ne 0 -a $RESULT -ne 77 ]; then echo "Don't forget to check the valgrind log at '`realpath $LOGFILE`'." >&2 fi diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 56453389..50803c88 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -74,7 +74,7 @@ class UnknownPropertyException(dbus.DBusException): def to_path_array(src): array = dbus.Array([], signature=dbus.Signature('o')) for o in src: - array.append(o.path) + array.append(to_path(o)) return array def to_path(src): @@ -312,7 +312,7 @@ class WifiAp(ExportedObj): props[PP_FLAGS] = dbus.UInt32(self.flags) props[PP_WPA_FLAGS] = dbus.UInt32(self.wpaf) props[PP_RSN_FLAGS] = dbus.UInt32(self.rsnf) - props[PP_SSID] = dbus.ByteArray(self.ssid) + props[PP_SSID] = dbus.ByteArray(self.ssid.encode('utf-8')) props[PP_FREQUENCY] = dbus.UInt32(self.freq) props[PP_HW_ADDRESS] = self.bssid props[PP_MODE] = dbus.UInt32(2) # NM_802_11_MODE_INFRA @@ -356,11 +356,7 @@ class WifiDevice(Device): @dbus.service.method(dbus_interface=IFACE_WIFI, in_signature='', out_signature='ao') def GetAccessPoints(self): # only include non-hidden APs - array = [] - for a in self.aps: - if a.ssid(): - array.append(a) - return to_path_array(array) + return to_path_array([a for a in self.aps if a.ssid]) @dbus.service.method(dbus_interface=IFACE_WIFI, in_signature='', out_signature='ao') def GetAllAccessPoints(self): @@ -414,7 +410,7 @@ class WifiDevice(Device): def add_test_ap(self, ssid, mac): ap = WifiAp(self._bus, ssid, mac, 0x1, 0x1cc, 0x1cc, 2412) self.add_ap(ap) - return ap.path + return ap def remove_ap_by_path(self, path): for ap in self.aps: @@ -546,7 +542,7 @@ class WimaxDevice(Device): def add_test_nsp(self, name): nsp = WimaxNsp(self._bus, name) self.add_nsp(nsp) - return nsp.path + return nsp def remove_nsp_by_path(self, path): for nsp in self.nsps: @@ -685,7 +681,7 @@ class NetworkManager(ExportedObj): for d in self.devices: # ignore iface/ip_iface distinction for now if d.iface == ip_iface: - return d.path + return to_path(d) raise UnknownDeviceException("No device found for the requested iface.") @dbus.service.method(dbus_interface=IFACE_NM, in_signature='ooo', out_signature='o') @@ -849,7 +845,7 @@ class NetworkManager(ExportedObj): raise PermissionDeniedException("Device already added") dev = WiredDevice(self._bus, ifname) self.add_device(dev) - return dbus.ObjectPath(dev.path) + return to_path(dev) @dbus.service.method(IFACE_TEST, in_signature='s', out_signature='o') def AddWifiDevice(self, ifname): @@ -858,7 +854,7 @@ class NetworkManager(ExportedObj): raise PermissionDeniedException("Device already added") dev = WifiDevice(self._bus, ifname) self.add_device(dev) - return dbus.ObjectPath(dev.path) + return to_path(dev) @dbus.service.method(IFACE_TEST, in_signature='s', out_signature='o') def AddWimaxDevice(self, ifname): @@ -867,7 +863,7 @@ class NetworkManager(ExportedObj): raise PermissionDeniedException("Device already added") dev = WimaxDevice(self._bus, ifname) self.add_device(dev) - return dbus.ObjectPath(dev.path) + return to_path(dev) @dbus.service.method(IFACE_TEST, in_signature='o', out_signature='') def RemoveDevice(self, path): @@ -881,7 +877,7 @@ class NetworkManager(ExportedObj): def AddWifiAp(self, ifname, ssid, mac): for d in self.devices: if d.iface == ifname: - return dbus.ObjectPath(d.add_test_ap(ssid, mac)) + return to_path(d.add_test_ap(ssid, mac)) raise UnknownDeviceException("Device not found") @dbus.service.method(IFACE_TEST, in_signature='so', out_signature='') @@ -896,7 +892,7 @@ class NetworkManager(ExportedObj): def AddWimaxNsp(self, ifname, name): for d in self.devices: if d.iface == ifname: - return dbus.ObjectPath(d.add_test_nsp(name)) + return to_path(d.add_test_nsp(name)) raise UnknownDeviceException("Device not found") @dbus.service.method(IFACE_TEST, in_signature='so', out_signature='') |