about summary refs log tree commit diff
path: root/src/nm-dispatcher
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2022-05-17 15:30:19 +0200
committerSebastien Bacher <seb128@ubuntu.com>2022-05-17 15:30:19 +0200
commit1e636d8e5e986b9f2260c36bb87fb499d724085c (patch)
treeac613b9372adf622496a7d616050d7e1c09b4fba /src/nm-dispatcher
parentf4966e573c855d4667e6c236d8197d9949020e21 (diff)
parent1a31bc3c63474ca02c83b02add85ea4e740e5597 (diff)
Merge remote-tracking branch 'debian/debian/master' into ubuntu/master
Diffstat (limited to 'src/nm-dispatcher')
-rw-r--r--src/nm-dispatcher/tests/test-dispatcher-envp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nm-dispatcher/tests/test-dispatcher-envp.c b/src/nm-dispatcher/tests/test-dispatcher-envp.c
index f53bb1c1..51d31544 100644
--- a/src/nm-dispatcher/tests/test-dispatcher-envp.c
+++ b/src/nm-dispatcher/tests/test-dispatcher-envp.c
@@ -530,8 +530,11 @@ test_generic(const char *file, const char *override_vpn_ip_iface)
 
     g_assert((!denv && error_message) || (denv && !error_message));
 
-    if (error_message)
+    if (error_message) {
+        NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER
         g_error("FAILED: %s", error_message);
+        NM_PRAGMA_WARNING_REENABLE
+    }
 
     if (g_strv_length(denv) != g_hash_table_size(expected_env)) {
         _print_env(NM_CAST_STRV_CC(denv), expected_env);
@@ -552,8 +555,10 @@ test_generic(const char *file, const char *override_vpn_ip_iface)
 
         foo = g_hash_table_lookup(expected_env, i_value);
         if (!foo) {
+            NM_PRAGMA_WARNING_DISABLE_DANGLING_POINTER
             _print_env(NM_CAST_STRV_CC(denv), expected_env);
             g_error("Failed to find %s in environment", i_value);
+            NM_PRAGMA_WARNING_REENABLE
         }
     }