Introduce tests/prof_cmocka.h

As 9f2abc75 accidentally got the ordering of some of the includes wrong,
I decided to propose my initial solution again.

Additional to that, I've opened a MR against CMocka to solve this on
their side, since I believe that the current way this is done is not
sustainable [0].

[0] https://gitlab.com/cmocka/cmocka/-/merge_requests/91

Fixes: 9f2abc75 ("Fix tests with gcc15 (uintptr_t)")
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>

CProof note: our new tests need to also be updated.

Makefile.am

@@ -124,6 +124,7 @@ unittest_sources = \
 	src/event/server_events.c src/event/server_events.h \
 	src/event/client_events.c src/event/client_events.h \
 	src/ui/tray.h src/ui/tray.c \
+	tests/prof_cmocka.h \
 	tests/unittests/xmpp/stub_vcard.c \
 	tests/unittests/xmpp/stub_avatar.c \
 	tests/unittests/xmpp/stub_ox.c \
@@ -170,6 +171,7 @@ unittest_sources = \
 	tests/unittests/unittests.c
 
 functionaltest_sources = \
+	tests/prof_cmocka.h \
 	tests/functionaltests/proftest.c tests/functionaltests/proftest.h \
 	tests/functionaltests/test_connect.c tests/functionaltests/test_connect.h \
 	tests/functionaltests/test_ping.c tests/functionaltests/test_ping.h \
@@ -284,6 +286,7 @@ endif
 
 TESTS = tests/unittests/unittests
 check_PROGRAMS = tests/unittests/unittests
+tests_unittests_unittests_CPPFLAGS = -Itests/
 tests_unittests_unittests_SOURCES = $(unittest_sources)
 tests_unittests_unittests_LDADD = -lcmocka
 

tests/functionaltests/functionaltests.c

@@ -1,10 +1,7 @@
-#include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stddef.h>
+#include "prof_cmocka.h"
-#include <setjmp.h>
-#include <cmocka.h>
 #include <sys/stat.h>
 
 #include "config.h"

tests/functionaltests/proftest.c

@@ -2,11 +2,8 @@
 #include <sys/wait.h>
 #include <glib.h>
 
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdlib.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/functionaltests/test_carbons.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_chat_session.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_connect.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_disconnect.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_message.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_muc.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_ping.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_presence.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_receipts.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_rooms.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_roster.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_software.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/prof_cmocka.h

@@ -0,0 +1,5 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>

tests/unittests/chatlog/stub_chatlog.c

@@ -21,8 +21,7 @@
  */
 
 #include <glib.h>
-#include <setjmp.h>
+#include "prof_cmocka.h"
-#include <cmocka.h>
 
 #include <xmpp/xmpp.h>
 

tests/unittests/config/stub_accounts.c

@@ -1,8 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
 
 #include "common.h"
 #include "config/account.h"

tests/unittests/database/stub_database.c

@@ -21,8 +21,7 @@
  */
 
 #include <glib.h>
-#include <setjmp.h>
+#include "prof_cmocka.h"
-#include <cmocka.h>
 
 #include "database.h"
 

tests/unittests/helpers.c

@@ -1,8 +1,5 @@
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdlib.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <glib.h>
 #include <stdio.h>
 #include <unistd.h>

tests/unittests/log/stub_log.c

@@ -20,10 +20,8 @@
  *
  */
 
-#include <stdint.h>
 #include <glib.h>
-#include <setjmp.h>
+#include "prof_cmocka.h"
-#include <cmocka.h>
 
 #include "log.h"
 

tests/unittests/otr/stub_otr.c

@@ -2,10 +2,7 @@
 #include <libotr/message.h>
 #include <glib.h>
 
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 
 #include "config/account.h"
 

tests/unittests/test_autocomplete.c

@@ -1,9 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "xmpp/contact.h"

tests/unittests/test_callbacks.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_chat_session.c

@@ -1,10 +1,6 @@
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
+#include "prof_cmocka.h"
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
-#include <stdint.h>
 
 #include "xmpp/chat_session.h"
 

tests/unittests/test_cmd_account.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_alias.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_bookmark.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_connect.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_disconnect.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/unittests/test_cmd_join.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_otr.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_pgp.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_presence.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_rooms.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_roster.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_sub.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_common.c

@@ -1,11 +1,7 @@
 #include "xmpp/resource.h"
 #include "common.h"
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
-#include <stdint.h>
 
 void
 replace_one_substr(void** state)

tests/unittests/test_contact.c

@@ -1,9 +1,6 @@
 #include <glib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
+#include "prof_cmocka.h"
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "xmpp/contact.h"

tests/unittests/test_form.c

@@ -1,8 +1,5 @@
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
+#include "prof_cmocka.h"
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "xmpp/form.h"

tests/unittests/test_jid.c

@@ -1,8 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "xmpp/jid.h"

tests/unittests/test_keyhandlers.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 

tests/unittests/test_muc.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "xmpp/muc.h"

tests/unittests/test_parser.c

@@ -1,8 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "tools/parser.h"

tests/unittests/test_plugins_disco.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 
 #include "plugins/disco.h"

tests/unittests/test_preferences.c

@@ -1,8 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_roster_list.c

@@ -1,11 +1,7 @@
 #include <glib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
+#include "prof_cmocka.h"
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
-#include <stdint.h>
 
 #include "xmpp/contact.h"
 #include "xmpp/roster_list.h"

tests/unittests/test_server_events.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/ui/stub_ui.c

@@ -3,8 +3,7 @@
 #include <glib.h>
 #include <wchar.h>
 
-#include <setjmp.h>
+#include "prof_cmocka.h"
-#include <cmocka.h>
 
 #include "ui/window.h"
 #include "ui/ui.h"

tests/unittests/unittests.c

@@ -1,10 +1,7 @@
-#include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stddef.h>
+#include "prof_cmocka.h"
-#include <setjmp.h>
-#include <cmocka.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <locale.h>

tests/unittests/xmpp/stub_xmpp.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
+#include "prof_cmocka.h"
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
 
 #include "xmpp/xmpp.h"