From ca0460dd76532f18c1c334a0e2df18d1473e8af3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 23 Sep 2018 10:13:39 +0200 Subject: Rebase patches --- ...test-don-t-assert-on-debug-level-messages.patch | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch (limited to 'debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch') diff --git a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch deleted file mode 100644 index 0a1273a5..00000000 --- a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Lubomir Rintel -Date: Sat, 11 Aug 2018 11:08:42 +0200 -Subject: utils/test: don't assert on debug level messages - -They come and go in GLib core for all sorts of purposes. Don't let that -break our tests. - -(cherry picked from commit 3e8eef538987c909e87b871a6b8c74aee08661a3) -Origin: upstream, 1.12.4, commit:5810c46b118447567e52199ca139c7a5e9be6ab4 ---- - shared/nm-utils/nm-test-utils.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h -index 743893f..d29e9ae 100644 ---- a/shared/nm-utils/nm-test-utils.h -+++ b/shared/nm-utils/nm-test-utils.h -@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ - #endif - } else { - /* We were called not to set logging levels. This means, that the user -- * expects to assert against (all) messages. Any uncought message is fatal. */ -- g_log_set_always_fatal (G_LOG_LEVEL_MASK); -+ * expects to assert against (all) messages. -+ * Any uncaught message on >debug level is fatal. */ -+ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); - } - - if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) && -- cgit 1.3.0-6-gf8a5