diff options
| author | James Booth <boothj5@gmail.com> | 2015-03-04 23:43:48 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-03-04 23:43:48 +0000 |
| commit | fe6a54f25344ad708e07a457e91bf0013c62593f (patch) | |
| tree | f998e558de333acad317b68293be7c0ea0efdad8 | |
| parent | 303f415306cc09003e3f5be602ed710e25b9754b (diff) | |
| parent | 7638f379cac3869abdd8530faa09cc7481e99ec6 (diff) | |
| download | profani-tty-fe6a54f25344ad708e07a457e91bf0013c62593f.tar.gz | |
Merge branch 'master' into readline
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | tests/testsuite.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 300116b1..cd708a13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ tests_sources = \ src/roster_list.c src/roster_list.h \ src/xmpp/xmpp.h src/xmpp/form.c \ src/ui/ui.h \ + src/otr/otr.h \ src/command/command.h src/command/command.c \ src/command/commands.h src/command/commands.c \ src/tools/parser.c \ @@ -61,7 +62,6 @@ tests_sources = \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ src/server_events.c src/server_events.h \ tests/xmpp/stub_xmpp.c \ - tests/otr/stub_otr.c \ tests/ui/stub_ui.c \ tests/log/stub_log.c \ tests/config/stub_accounts.c \ @@ -101,6 +101,9 @@ otr3_sources = \ otr4_sources = \ 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/* 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 if BUILD_OTR +tests_sources += $(otr_test_sources) if BUILD_OTR3 core_sources += $(otr3_sources) endif diff --git a/tests/testsuite.c b/tests/testsuite.c index 0c6a4402..78d7b570 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -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_muc_sets_muc), 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_invalid_otr_policy), 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_sets_status_when_valid), unit_test(cmd_account_set_status_sets_status_when_last), |