From 1c285284ad96d393b7fc2afde93a839721e86072 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Mon, 8 Jan 2018 14:33:12 +0100 Subject: [PATCH] Merge pull request #806 from ailin-nemui/fix-tests-old-glib only use nonfatal assertions for GLib that actually supports it (cherry picked from commit 2e28606635495f903a3f24cdf1c248e60e802866) --- tests/fe-common/core/test-formats.c | 2 ++ tests/irc/core/test-irc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/fe-common/core/test-formats.c b/tests/fe-common/core/test-formats.c index 9ef23fd6..08d706ac 100644 --- a/tests/fe-common/core/test-formats.c +++ b/tests/fe-common/core/test-formats.c @@ -31,7 +31,9 @@ int main(int argc, char **argv) g_free(name); } +#if GLIB_CHECK_VERSION(2,38,0) g_test_set_nonfatal_assertions(); +#endif return g_test_run(); } diff --git a/tests/irc/core/test-irc.c b/tests/irc/core/test-irc.c index c96956df..3eaf7020 100644 --- a/tests/irc/core/test-irc.c +++ b/tests/irc/core/test-irc.c @@ -197,7 +197,9 @@ int main(int argc, char **argv) g_free(name); } +#if GLIB_CHECK_VERSION(2,38,0) g_test_set_nonfatal_assertions(); +#endif return g_test_run(); }