From f0e3f9e79a5450d59401c41d6890efefadcc4a12 Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Thu, 27 Feb 2020 13:16:43 +0100
Subject: [PATCH] gtk.cfg: Fix/enhance Gtk library configuration (g_abort and
 others) (#2558)

test/CMakeLists.txt: Fix missing INCONCLUSIVE for Gtk configuration test
---
 cfg/gtk.cfg         | 22 ++++++++++++++++++++--
 test/CMakeLists.txt |  2 +-
 test/cfg/gtk.c      |  8 ++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/cfg/gtk.cfg b/cfg/gtk.cfg
index 11e1db7df..7f89ac49b 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -873,6 +873,10 @@
   <function name="g_exit">
     <noreturn>true</noreturn>
   </function>
+  <!-- void g_abort (void) -->
+  <function name="g_abort">
+    <noreturn>true</noreturn>
+  </function>
   <!-- gboolean g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value); -->
   <function name="g_hash_table_insert">
     <noreturn>false</noreturn>
@@ -5862,9 +5866,16 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- void g_option_context_add_group (GOptionContext *context, GOptionGroup *group); -->
   <function name="g_option_context_add_group">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_option_context_add_main_entries">
     <leak-ignore/>
@@ -5906,9 +5917,16 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- void g_option_context_set_main_group (GOptionContext *context, GOptionGroup *group); -->
   <function name="g_option_context_set_main_group">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_option_context_set_summary">
     <leak-ignore/>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index dd42e6db8..bf3033e2a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -123,7 +123,7 @@ if (BUILD_TESTS)
     add_cfg(bsd.c)
     add_cfg(gnu.c LIBRARY posix gnu)
     add_cfg(googletest.cpp)
-    add_cfg(gtk.c)
+    add_cfg(gtk.c INCONCLUSIVE)
     add_cfg(libcurl.c)
     add_cfg(lua.c)
     add_cfg(openmp.c)
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 0f152d286..a935deb54 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -7,6 +7,7 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib.h>
 
@@ -421,3 +422,10 @@ void g_strchug_g_strchomp_test(gchar * str1)
     // cppcheck-suppress uninitvar
     g_strchomp(str3);
 }
+
+void g_abort_test()
+{
+    g_abort();
+    //cppcheck-suppress unreachableCode
+    printf("Never reached");
+}