aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into readline

Browse Source
This commit is contained in:
James Booth 2015-03-04 23:43:48 +00:00
commit fe6a54f253
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -43,6 +43,7 @@ tests_sources = \
src/roster_list.c src/roster_list.h \ src/roster_list.c src/roster_list.h \
src/xmpp/xmpp.h src/xmpp/form.c \ src/xmpp/xmpp.h src/xmpp/form.c \
src/ui/ui.h \ src/ui/ui.h \
src/otr/otr.h \
src/command/command.h src/command/command.c \ src/command/command.h src/command/command.c \
src/command/commands.h src/command/commands.c \ src/command/commands.h src/command/commands.c \
src/tools/parser.c \ src/tools/parser.c \
@ -61,7 +62,6 @@ tests_sources = \
src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
src/server_events.c src/server_events.h \ src/server_events.c src/server_events.h \
tests/xmpp/stub_xmpp.c \ tests/xmpp/stub_xmpp.c \
tests/otr/stub_otr.c \
tests/ui/stub_ui.c \ tests/ui/stub_ui.c \
tests/log/stub_log.c \ tests/log/stub_log.c \
tests/config/stub_accounts.c \ tests/config/stub_accounts.c \
@ -101,6 +101,9 @@ otr3_sources = \
otr4_sources = \ otr4_sources = \
src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c
otr_test_sources = \
tests/otr/stub_otr.c
themes_sources = themes/* themes_sources = themes/*
script_sources = bootstrap.sh configure-debug install-all.sh script_sources = bootstrap.sh configure-debug install-all.sh
@ -108,6 +111,7 @@ script_sources = bootstrap.sh configure-debug install-all.sh
man_sources = docs/profanity.1 man_sources = docs/profanity.1
if BUILD_OTR if BUILD_OTR
tests_sources += $(otr_test_sources)
if BUILD_OTR3 if BUILD_OTR3
core_sources += $(otr3_sources) core_sources += $(otr3_sources)
endif endif

2
tests/testsuite.c
View File

@ -331,9 +331,11 @@ int main(int argc, char* argv[]) {
unit_test(cmd_account_set_eval_password_when_password_set), unit_test(cmd_account_set_eval_password_when_password_set),
unit_test(cmd_account_set_muc_sets_muc), unit_test(cmd_account_set_muc_sets_muc),
unit_test(cmd_account_set_nick_sets_nick), unit_test(cmd_account_set_nick_sets_nick),
#ifdef HAVE_LIBOTR
unit_test(cmd_account_show_message_for_missing_otr_policy), unit_test(cmd_account_show_message_for_missing_otr_policy),
unit_test(cmd_account_show_message_for_invalid_otr_policy), unit_test(cmd_account_show_message_for_invalid_otr_policy),
unit_test(cmd_account_set_otr_sets_otr), unit_test(cmd_account_set_otr_sets_otr),
#endif
unit_test(cmd_account_set_status_shows_message_when_invalid_status), unit_test(cmd_account_set_status_shows_message_when_invalid_status),
unit_test(cmd_account_set_status_sets_status_when_valid), unit_test(cmd_account_set_status_sets_status_when_valid),
unit_test(cmd_account_set_status_sets_status_when_last), unit_test(cmd_account_set_status_sets_status_when_last),