From ecdf29911311357b6f28c9883d4c565e11f00c1e Mon Sep 17 00:00:00 2001 From: "jabber.developer2" Date: Tue, 9 Dec 2025 17:00:52 +0300 Subject: [PATCH] fix(build): Add stabber submodule and make functional tests conditional - Add stabber as git submodule from jabber.space fork (fix/xmpp-parsing branch) - Make functional tests conditional on HAVE_STABBER and HAVE_EXPECT - Tests are skipped when dependencies are not available, preventing CI failures Submodule: https://git.jabber.space/jabber.developer2/stabber.git Branch: fix/xmpp-parsing --- .gitmodules | 4 ++++ Makefile.am | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..90b82559 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "external/stabber"] + path = external/stabber + url = https://git.jabber.space/jabber.developer2/stabber.git + branch = fix/xmpp-parsing diff --git a/Makefile.am b/Makefile.am index bce1c91c..d9934762 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,15 +290,14 @@ tests_unittests_unittests_CPPFLAGS = -Itests/ tests_unittests_unittests_SOURCES = $(unittest_sources) tests_unittests_unittests_LDADD = -lcmocka -# Functional test were commented out because of: -# https://github.com/profanity-im/profanity/pull/1010 -# An issue was raised for stabber: -# https://github.com/profanity-im/stabber/issues/5 -# Once this issue is resolved functional tests should be enabled again +# Functional tests require libstabber and libexpect. +# They are only built when both libraries are available. +# See: https://github.com/profanity-im/profanity/pull/1010 +# https://github.com/profanity-im/stabber/issues/5 # -# Note: We enable functional tests unconditionally here and link Tcl explicitly, -# because Debian/Ubuntu's libexpect requires -ltcl8.6 for linkage and the -# configure test for exp_expectl may fail otherwise. +# Note: Debian/Ubuntu's libexpect requires -ltcl8.6 for linkage. +if HAVE_STABBER +if HAVE_EXPECT TESTS += tests/functionaltests/functionaltests check_PROGRAMS += tests/functionaltests/functionaltests tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources) @@ -306,6 +305,8 @@ tests_functionaltests_functionaltests_CPPFLAGS = -Itests/ -I$(top_srcdir)/extern tests_functionaltests_functionaltests_CFLAGS = $(AM_CFLAGS) -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 -I$(top_srcdir)/external/stabber tests_functionaltests_functionaltests_LDFLAGS = -L$(top_srcdir)/external/stabber/.libs -Wl,-rpath,$(top_srcdir)/external/stabber/.libs tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl8.6 +endif +endif man1_MANS = $(man1_sources)