New upstream version 1.11.3 upstream/1.11.3

3 files changed, 20 insertions, 7 deletions

diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh
index b44e44bf..68752c54 100755
--- a/tools/create-exports-NetworkManager.sh
+++ b/tools/create-exports-NetworkManager.sh
@@ -19,7 +19,7 @@ die() {
 _build() {
     git clean -fdx
     ./autogen.sh --enable-ld-gc --enable-ifcfg-rh --enable-ifupdown \
-        --enable-ifnet --enable-ibft --enable-teamdctl --enable-wifi \
+        --enable-ibft --enable-teamdctl --enable-wifi \
         --with-modem-manager-1 --with-ofono --with-more-asserts \
         --with-more-logging
     make -j20
diff --git a/tools/debug-helper.py b/tools/debug-helper.py
index 07338242..b841c39c 100755
--- a/tools/debug-helper.py
+++ b/tools/debug-helper.py
@@ -30,27 +30,27 @@ if args.do_set_nm_logging:
     dom_msg = ""
     if args.log_domains:
             dom_msg = " for domains: " + ','.join(args.log_domains)
-    print "Setting NetworkManager log level to '" + args.do_set_nm_logging + "'" + dom_msg
+    print("Setting NetworkManager log level to '" + args.do_set_nm_logging + "'" + dom_msg)
 
     nm_bus = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager')
     nm = dbus.Interface(nm_bus, dbus_interface='org.freedesktop.NetworkManager')
     nm.SetLogging(args.do_set_nm_logging, ','.join(args.log_domains))
 
 if args.do_set_mm_logging:
-    print "Setting ModemManager log level to '" + args.do_set_mm_logging + "'"
+    print("Setting ModemManager log level to '" + args.do_set_mm_logging + "'")
 
     mm_bus = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
     mm = dbus.Interface(mm_bus, dbus_interface='org.freedesktop.ModemManager')
     mm.SetLogging(args.do_set_mm_logging)
 
 if args.do_set_wpa_logging:
-    print "Setting wpa_supplicant log level to '" + args.do_set_wpa_logging + "'"
+    print("Setting wpa_supplicant log level to '" + args.do_set_wpa_logging + "'")
 
     if 'debug' in args.do_set_wpa_logging or 'msgdump' in args.do_set_wpa_logging:
-	print "Enabling timestamps for wpasupplicant debugging logs"
+        print("Enabling timestamps for wpasupplicant debugging logs")
         use_timestamps = dbus.Boolean(True, variant_level=1)
     else:
-	print "Disabling timestamps for wpasupplicant debugging logs"
+        print("Disabling timestamps for wpasupplicant debugging logs")
         use_timestamps = dbus.Boolean(False, variant_level=1)
 
     wpa_bus = bus.get_object('fi.w1.wpa_supplicant1', '/fi/w1/wpa_supplicant1')
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 5848d0a0..7f3053ce 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -35,7 +35,12 @@ else
 fi
 
 if [ "$CALLED_FROM_MAKE" == 1 ]; then
-    NMTST_LIBTOOL=($1 --mode=execute); shift
+    if [ -n "$1" ]; then
+        NMTST_LIBTOOL=($1 --mode=execute);
+    else
+        NMTST_LIBTOOL=()
+    fi
+    shift
     NMTST_VALGRIND_ARG="$1"; shift
     if [[ "$NMTST_VALGRIND_ARG" == no ]]; then
         NMTST_VALGRIND_ARG=
@@ -121,6 +126,10 @@ else
             NMTST_USE_VALGRIND=0
             shift;
             ;;
+        "-d")
+            NMTST_SET_DEBUG=1
+            shift;
+            ;;
         "--test"|-t)
             shift
             TEST="$1"
@@ -146,6 +155,10 @@ else
 
 fi
 
+if [ "$NMTST_SET_DEBUG" == 1 -a -z "${NMTST_DEBUG+x}" ]; then
+    export NMTST_DEBUG=d
+fi
+
 if _is_true "$NMTST_MAKE_FIRST" 0; then
     git_dir="$(readlink -f "$(git rev-parse --show-toplevel)")"
     rel_path="$(realpath --relative-to="$git_dir" -m "$TEST" 2>/dev/null)" || die "cannot resolve test-name \"$TEST\". Did you call the script properly?"