Merge upstream/master into merge/upstream-full
Some checks failed
CI Code / Check coding style (pull_request) Failing after 7s
CI Code / Check spelling (pull_request) Successful in 17s
CI Code / Linux (debian) (pull_request) Successful in 7m1s
CI Code / Linux (ubuntu) (pull_request) Successful in 7m44s
CI Code / Code Coverage (pull_request) Successful in 7m35s
Lint / DCO (pull_request) Failing after 7s
Lint / conventional commits (pull_request) Failing after 45s
CI Code / Linux (arch) (pull_request) Successful in 9m23s
Build / ubuntu | func | signal (pull_request) Has been cancelled
Lint / coding style (pull_request) Has been cancelled
Lint / spellcheck (pull_request) Has been cancelled
Build / cygwin / build only (pull_request) Has been cancelled
CodeQL / analyze (pull_request) Has been cancelled
Some checks failed
CI Code / Check coding style (pull_request) Failing after 7s
CI Code / Check spelling (pull_request) Successful in 17s
CI Code / Linux (debian) (pull_request) Successful in 7m1s
CI Code / Linux (ubuntu) (pull_request) Successful in 7m44s
CI Code / Code Coverage (pull_request) Successful in 7m35s
Lint / DCO (pull_request) Failing after 7s
Lint / conventional commits (pull_request) Failing after 45s
CI Code / Linux (arch) (pull_request) Successful in 9m23s
Build / ubuntu | func | signal (pull_request) Has been cancelled
Lint / coding style (pull_request) Has been cancelled
Lint / spellcheck (pull_request) Has been cancelled
Build / cygwin / build only (pull_request) Has been cancelled
CodeQL / analyze (pull_request) Has been cancelled
Merge profanity-im/profanity master (373 commits) into cproof fork.
Source changes (manual merge):
- src/command/: cmd_defs, cmd_funcs, cmd_ac — upstream g_new0, auto_gchar,
launch_editor callback; keep our XEP-0308 LMC, force-encryption, CWE-134
- src/config/: preferences, tlscerts, account — upstream UNIQUE dedup,
dynamic pad capacity; keep our db_history_result_t, scroll logic
- src/database.*: upstream g_new0 memory mgmt; keep our return types,
add null-check fix for msg->timestamp
- src/omemo/, src/pgp/: upstream _gpgme_key_get_email, g_new0;
keep our replace_id in omemo_on_message_send
- src/tools/: editor, http_upload, bookmark_ignore — upstream launch_editor
callback API
- src/ui/: console, window, chatwin, mucwin, inputwin, buffer —
upstream win_warn_needed/sent dedup, PAD_MIN_HEIGHT dynamic pads;
keep our y_start_pos scroll, _truncate_datetime_suffix
- src/xmpp/: message, stanza, presence, roster_list, iq, session —
upstream connection_get_available_resources; keep our LMC stanza logic
- src/common.c: fix format-security (cons_show)
Build system:
- Makefile.am: updated test paths to subdirectory structure, added
test_cmd_ac, test_forced_encryption
- Restored autotools files deleted by upstream meson migration:
bootstrap.sh, autogen.sh, m4/ax_valgrind_check.m4, configure-debug
Tests:
- Unit tests: upstream unittests.c base + our forced_encryption tests
(482 passed, 0 failed across all 4 configurations)
- Functional tests: kept our version (93 passed, 0 failed)
upstream version requires stbbr_for_xmlns not yet in our stabber fork
- Updated test stubs: stub_xmpp.c, stub_omemo.c from upstream
Compile fixes:
- src/common.c: cons_show(errmsg) -> cons_show("%s", errmsg)
- src/database.c: null-check before msg->timestamp access
- src/ui/console.c: size_t -> (int) cast for format width
- src/config/tlscerts.c: %d -> %zu for size_t
This commit is contained in:
51
Makefile.am
51
Makefile.am
@@ -142,31 +142,32 @@ unittest_sources = \
|
||||
tests/unittests/tools/stub_aesgcm_download.c \
|
||||
tests/unittests/tools/stub_plugin_download.c \
|
||||
tests/unittests/helpers.c tests/unittests/helpers.h \
|
||||
tests/unittests/test_form.c tests/unittests/test_form.h \
|
||||
tests/unittests/xmpp/test_form.c tests/unittests/xmpp/test_form.h \
|
||||
tests/unittests/test_common.c tests/unittests/test_common.h \
|
||||
tests/unittests/test_autocomplete.c tests/unittests/test_autocomplete.h \
|
||||
tests/unittests/test_jid.c tests/unittests/test_jid.h \
|
||||
tests/unittests/test_parser.c tests/unittests/test_parser.h \
|
||||
tests/unittests/test_roster_list.c tests/unittests/test_roster_list.h \
|
||||
tests/unittests/test_chat_session.c tests/unittests/test_chat_session.h \
|
||||
tests/unittests/test_contact.c tests/unittests/test_contact.h \
|
||||
tests/unittests/test_preferences.c tests/unittests/test_preferences.h \
|
||||
tests/unittests/test_server_events.c tests/unittests/test_server_events.h \
|
||||
tests/unittests/test_muc.c tests/unittests/test_muc.h \
|
||||
tests/unittests/test_cmd_presence.c tests/unittests/test_cmd_presence.h \
|
||||
tests/unittests/test_cmd_alias.c tests/unittests/test_cmd_alias.h \
|
||||
tests/unittests/test_cmd_connect.c tests/unittests/test_cmd_connect.h \
|
||||
tests/unittests/test_cmd_rooms.c tests/unittests/test_cmd_rooms.h \
|
||||
tests/unittests/test_cmd_account.c tests/unittests/test_cmd_account.h \
|
||||
tests/unittests/test_cmd_sub.c tests/unittests/test_cmd_sub.h \
|
||||
tests/unittests/test_cmd_bookmark.c tests/unittests/test_cmd_bookmark.h \
|
||||
tests/unittests/test_cmd_otr.c tests/unittests/test_cmd_otr.h \
|
||||
tests/unittests/test_cmd_pgp.c tests/unittests/test_cmd_pgp.h \
|
||||
tests/unittests/test_cmd_join.c tests/unittests/test_cmd_join.h \
|
||||
tests/unittests/test_cmd_roster.c tests/unittests/test_cmd_roster.h \
|
||||
tests/unittests/test_cmd_disconnect.c tests/unittests/test_cmd_disconnect.h \
|
||||
tests/unittests/test_callbacks.c tests/unittests/test_callbacks.h \
|
||||
tests/unittests/test_plugins_disco.c tests/unittests/test_plugins_disco.h \
|
||||
tests/unittests/tools/test_autocomplete.c tests/unittests/tools/test_autocomplete.h \
|
||||
tests/unittests/xmpp/test_jid.c tests/unittests/xmpp/test_jid.h \
|
||||
tests/unittests/tools/test_parser.c tests/unittests/tools/test_parser.h \
|
||||
tests/unittests/xmpp/test_roster_list.c tests/unittests/xmpp/test_roster_list.h \
|
||||
tests/unittests/xmpp/test_chat_session.c tests/unittests/xmpp/test_chat_session.h \
|
||||
tests/unittests/xmpp/test_contact.c tests/unittests/xmpp/test_contact.h \
|
||||
tests/unittests/config/test_preferences.c tests/unittests/config/test_preferences.h \
|
||||
tests/unittests/event/test_server_events.c tests/unittests/event/test_server_events.h \
|
||||
tests/unittests/xmpp/test_muc.c tests/unittests/xmpp/test_muc.h \
|
||||
tests/unittests/command/test_cmd_presence.c tests/unittests/command/test_cmd_presence.h \
|
||||
tests/unittests/command/test_cmd_alias.c tests/unittests/command/test_cmd_alias.h \
|
||||
tests/unittests/command/test_cmd_connect.c tests/unittests/command/test_cmd_connect.h \
|
||||
tests/unittests/command/test_cmd_rooms.c tests/unittests/command/test_cmd_rooms.h \
|
||||
tests/unittests/command/test_cmd_account.c tests/unittests/command/test_cmd_account.h \
|
||||
tests/unittests/command/test_cmd_sub.c tests/unittests/command/test_cmd_sub.h \
|
||||
tests/unittests/command/test_cmd_bookmark.c tests/unittests/command/test_cmd_bookmark.h \
|
||||
tests/unittests/command/test_cmd_otr.c tests/unittests/command/test_cmd_otr.h \
|
||||
tests/unittests/command/test_cmd_pgp.c tests/unittests/command/test_cmd_pgp.h \
|
||||
tests/unittests/command/test_cmd_join.c tests/unittests/command/test_cmd_join.h \
|
||||
tests/unittests/command/test_cmd_roster.c tests/unittests/command/test_cmd_roster.h \
|
||||
tests/unittests/command/test_cmd_disconnect.c tests/unittests/command/test_cmd_disconnect.h \
|
||||
tests/unittests/command/test_cmd_ac.c tests/unittests/command/test_cmd_ac.h \
|
||||
tests/unittests/plugins/test_callbacks.c tests/unittests/plugins/test_callbacks.h \
|
||||
tests/unittests/plugins/test_plugins_disco.c tests/unittests/plugins/test_plugins_disco.h \
|
||||
tests/unittests/test_forced_encryption.c tests/unittests/test_forced_encryption.h \
|
||||
tests/unittests/unittests.c
|
||||
|
||||
@@ -289,7 +290,7 @@ endif
|
||||
|
||||
TESTS = tests/unittests/unittests
|
||||
check_PROGRAMS = tests/unittests/unittests
|
||||
tests_unittests_unittests_CPPFLAGS = -I$(srcdir)/tests
|
||||
tests_unittests_unittests_CPPFLAGS = -I$(srcdir)/tests -I$(srcdir)/tests/unittests
|
||||
tests_unittests_unittests_SOURCES = $(unittest_sources)
|
||||
tests_unittests_unittests_LDADD = -lcmocka
|
||||
|
||||
|
||||
Reference in New Issue
Block a user