diff --git a/.gitignore b/.gitignore index cf6e3eba..c62b5575 100644 --- a/.gitignore +++ b/.gitignore @@ -39,12 +39,12 @@ profanity **/*.o # test output -functionaltests/functionaltests -functionaltests/functionaltests.log -functionaltests/functionaltests.trs -unittests/unittests -unittests/unittests.log -unittests/unittests.trs +tests/functionaltests/functionaltests +tests/functionaltests/functionaltests.log +tests/functionaltests/functionaltests.trs +tests/unittests/unittests +tests/unittests/unittests.log +tests/unittests/unittests.trs test-suite.log # local scripts diff --git a/Makefile.am b/Makefile.am index c566b675..ef1477f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,44 +65,44 @@ unittest_sources = \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ src/event/ui_events.c src/event/ui_events.h \ - unittests/xmpp/stub_xmpp.c \ - unittests/ui/stub_ui.c \ - unittests/log/stub_log.c \ - unittests/config/stub_accounts.c \ - unittests/helpers.c unittests/helpers.h \ - unittests/test_cmd_account.c unittests/test_cmd_account.h \ - unittests/test_cmd_alias.c unittests/test_cmd_alias.h \ - unittests/test_cmd_bookmark.c unittests/test_cmd_bookmark.h \ - unittests/test_cmd_connect.c unittests/test_cmd_connect.h \ - unittests/test_cmd_join.c unittests/test_cmd_join.h \ - unittests/test_cmd_otr.c unittests/test_cmd_otr.h \ - unittests/test_cmd_rooms.c unittests/test_cmd_rooms.h \ - unittests/test_cmd_roster.c unittests/test_cmd_roster.h \ - unittests/test_cmd_statuses.c unittests/test_cmd_statuses.h \ - unittests/test_cmd_sub.c unittests/test_cmd_sub.h \ - unittests/test_cmd_disconnect.c unittests/test_cmd_disconnect.h \ - unittests/test_common.c unittests/test_common.h \ - unittests/test_contact.c unittests/test_contact.h \ - unittests/test_form.c unittests/test_form.h \ - unittests/test_jid.c unittests/test_jid.h \ - unittests/test_muc.c unittests/test_muc.h \ - unittests/test_parser.c unittests/test_parser.h \ - unittests/test_preferences.c unittests/test_preferences.h \ - unittests/test_roster_list.c unittests/test_roster_list.h \ - unittests/test_server_events.c unittests/test_server_events.h \ - unittests/test_autocomplete.c unittests/test_autocomplete.h \ - unittests/test_chat_session.c unittests/test_chat_session.h \ - unittests/unittests.c + tests/unittests/xmpp/stub_xmpp.c \ + tests/unittests/ui/stub_ui.c \ + tests/unittests/log/stub_log.c \ + tests/unittests/config/stub_accounts.c \ + tests/unittests/helpers.c tests/unittests/helpers.h \ + tests/unittests/test_cmd_account.c tests/unittests/test_cmd_account.h \ + tests/unittests/test_cmd_alias.c tests/unittests/test_cmd_alias.h \ + tests/unittests/test_cmd_bookmark.c tests/unittests/test_cmd_bookmark.h \ + tests/unittests/test_cmd_connect.c tests/unittests/test_cmd_connect.h \ + tests/unittests/test_cmd_join.c tests/unittests/test_cmd_join.h \ + tests/unittests/test_cmd_otr.c tests/unittests/test_cmd_otr.h \ + tests/unittests/test_cmd_rooms.c tests/unittests/test_cmd_rooms.h \ + tests/unittests/test_cmd_roster.c tests/unittests/test_cmd_roster.h \ + tests/unittests/test_cmd_statuses.c tests/unittests/test_cmd_statuses.h \ + tests/unittests/test_cmd_sub.c tests/unittests/test_cmd_sub.h \ + tests/unittests/test_cmd_disconnect.c tests/unittests/test_cmd_disconnect.h \ + tests/unittests/test_common.c tests/unittests/test_common.h \ + tests/unittests/test_contact.c tests/unittests/test_contact.h \ + tests/unittests/test_form.c tests/unittests/test_form.h \ + tests/unittests/test_jid.c tests/unittests/test_jid.h \ + tests/unittests/test_muc.c tests/unittests/test_muc.h \ + tests/unittests/test_parser.c tests/unittests/test_parser.h \ + tests/unittests/test_preferences.c tests/unittests/test_preferences.h \ + tests/unittests/test_roster_list.c tests/unittests/test_roster_list.h \ + tests/unittests/test_server_events.c tests/unittests/test_server_events.h \ + tests/unittests/test_autocomplete.c tests/unittests/test_autocomplete.h \ + tests/unittests/test_chat_session.c tests/unittests/test_chat_session.h \ + tests/unittests/unittests.c functionaltest_sources = \ - functionaltests/proftest.c functionaltests/proftest.h \ - functionaltests/test_connect.c functionaltests/test_connect.h \ - functionaltests/test_ping.c functionaltests/test_ping.h \ - functionaltests/test_rooms.c functionaltests/test_rooms.h \ - functionaltests/test_presence.c functionaltests/test_presence.h \ - functionaltests/test_message.c functionaltests/test_message.h \ - functionaltests/test_chat_session.c functionaltests/test_chat_session.h \ - functionaltests/functionaltests.c + 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 \ + tests/functionaltests/test_rooms.c tests/functionaltests/test_rooms.h \ + tests/functionaltests/test_presence.c tests/functionaltests/test_presence.h \ + tests/functionaltests/test_message.c tests/functionaltests/test_message.h \ + tests/functionaltests/test_chat_session.c tests/functionaltests/test_chat_session.h \ + tests/functionaltests/functionaltests.c main_source = src/main.c @@ -115,7 +115,7 @@ otr4_sources = \ src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c otr_unittest_sources = \ - unittests/otr/stub_otr.c + tests/unittests/otr/stub_otr.c themes_sources = themes/* @@ -143,13 +143,13 @@ if INCLUDE_GIT_VERSION BUILT_SOURCES = $(git_include) endif -TESTS = unittests/unittests functionaltests/functionaltests -check_PROGRAMS = unittests/unittests functionaltests/functionaltests -unittests_unittests_SOURCES = $(unittest_sources) -unittests_unittests_LDADD = -lcmocka -functionaltests_functionaltests_SOURCES = $(functionaltest_sources) -functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 -functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl +TESTS = tests/unittests/unittests tests/functionaltests/functionaltests +check_PROGRAMS = tests/unittests/unittests tests/functionaltests/functionaltests +tests_unittests_unittests_SOURCES = $(unittest_sources) +tests_unittests_unittests_LDADD = -lcmocka +tests_functionaltests_functionaltests_SOURCES = $(functionaltest_sources) +tests_functionaltests_functionaltests_CFLAGS = -I/usr/include/tcl8.6 -I/usr/include/tcl8.5 +tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber -lexpect -ltcl man_MANS = $(man_sources) diff --git a/functionaltests/functionaltests.c b/tests/functionaltests/functionaltests.c similarity index 100% rename from functionaltests/functionaltests.c rename to tests/functionaltests/functionaltests.c diff --git a/functionaltests/proftest.c b/tests/functionaltests/proftest.c similarity index 100% rename from functionaltests/proftest.c rename to tests/functionaltests/proftest.c diff --git a/functionaltests/proftest.h b/tests/functionaltests/proftest.h similarity index 100% rename from functionaltests/proftest.h rename to tests/functionaltests/proftest.h diff --git a/functionaltests/test_chat_session.c b/tests/functionaltests/test_chat_session.c similarity index 100% rename from functionaltests/test_chat_session.c rename to tests/functionaltests/test_chat_session.c diff --git a/functionaltests/test_chat_session.h b/tests/functionaltests/test_chat_session.h similarity index 100% rename from functionaltests/test_chat_session.h rename to tests/functionaltests/test_chat_session.h diff --git a/functionaltests/test_connect.c b/tests/functionaltests/test_connect.c similarity index 100% rename from functionaltests/test_connect.c rename to tests/functionaltests/test_connect.c diff --git a/functionaltests/test_connect.h b/tests/functionaltests/test_connect.h similarity index 100% rename from functionaltests/test_connect.h rename to tests/functionaltests/test_connect.h diff --git a/functionaltests/test_message.c b/tests/functionaltests/test_message.c similarity index 100% rename from functionaltests/test_message.c rename to tests/functionaltests/test_message.c diff --git a/functionaltests/test_message.h b/tests/functionaltests/test_message.h similarity index 100% rename from functionaltests/test_message.h rename to tests/functionaltests/test_message.h diff --git a/functionaltests/test_ping.c b/tests/functionaltests/test_ping.c similarity index 100% rename from functionaltests/test_ping.c rename to tests/functionaltests/test_ping.c diff --git a/functionaltests/test_ping.h b/tests/functionaltests/test_ping.h similarity index 100% rename from functionaltests/test_ping.h rename to tests/functionaltests/test_ping.h diff --git a/functionaltests/test_presence.c b/tests/functionaltests/test_presence.c similarity index 100% rename from functionaltests/test_presence.c rename to tests/functionaltests/test_presence.c diff --git a/functionaltests/test_presence.h b/tests/functionaltests/test_presence.h similarity index 100% rename from functionaltests/test_presence.h rename to tests/functionaltests/test_presence.h diff --git a/functionaltests/test_rooms.c b/tests/functionaltests/test_rooms.c similarity index 100% rename from functionaltests/test_rooms.c rename to tests/functionaltests/test_rooms.c diff --git a/functionaltests/test_rooms.h b/tests/functionaltests/test_rooms.h similarity index 100% rename from functionaltests/test_rooms.h rename to tests/functionaltests/test_rooms.h diff --git a/unittests/config/stub_accounts.c b/tests/unittests/config/stub_accounts.c similarity index 100% rename from unittests/config/stub_accounts.c rename to tests/unittests/config/stub_accounts.c diff --git a/unittests/helpers.c b/tests/unittests/helpers.c similarity index 100% rename from unittests/helpers.c rename to tests/unittests/helpers.c diff --git a/unittests/helpers.h b/tests/unittests/helpers.h similarity index 100% rename from unittests/helpers.h rename to tests/unittests/helpers.h diff --git a/unittests/log/stub_log.c b/tests/unittests/log/stub_log.c similarity index 100% rename from unittests/log/stub_log.c rename to tests/unittests/log/stub_log.c diff --git a/unittests/otr/stub_otr.c b/tests/unittests/otr/stub_otr.c similarity index 100% rename from unittests/otr/stub_otr.c rename to tests/unittests/otr/stub_otr.c diff --git a/unittests/test_autocomplete.c b/tests/unittests/test_autocomplete.c similarity index 100% rename from unittests/test_autocomplete.c rename to tests/unittests/test_autocomplete.c diff --git a/unittests/test_autocomplete.h b/tests/unittests/test_autocomplete.h similarity index 100% rename from unittests/test_autocomplete.h rename to tests/unittests/test_autocomplete.h diff --git a/unittests/test_chat_session.c b/tests/unittests/test_chat_session.c similarity index 100% rename from unittests/test_chat_session.c rename to tests/unittests/test_chat_session.c diff --git a/unittests/test_chat_session.h b/tests/unittests/test_chat_session.h similarity index 100% rename from unittests/test_chat_session.h rename to tests/unittests/test_chat_session.h diff --git a/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c similarity index 100% rename from unittests/test_cmd_account.c rename to tests/unittests/test_cmd_account.c diff --git a/unittests/test_cmd_account.h b/tests/unittests/test_cmd_account.h similarity index 100% rename from unittests/test_cmd_account.h rename to tests/unittests/test_cmd_account.h diff --git a/unittests/test_cmd_alias.c b/tests/unittests/test_cmd_alias.c similarity index 100% rename from unittests/test_cmd_alias.c rename to tests/unittests/test_cmd_alias.c diff --git a/unittests/test_cmd_alias.h b/tests/unittests/test_cmd_alias.h similarity index 100% rename from unittests/test_cmd_alias.h rename to tests/unittests/test_cmd_alias.h diff --git a/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c similarity index 100% rename from unittests/test_cmd_bookmark.c rename to tests/unittests/test_cmd_bookmark.c diff --git a/unittests/test_cmd_bookmark.h b/tests/unittests/test_cmd_bookmark.h similarity index 100% rename from unittests/test_cmd_bookmark.h rename to tests/unittests/test_cmd_bookmark.h diff --git a/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c similarity index 100% rename from unittests/test_cmd_connect.c rename to tests/unittests/test_cmd_connect.c diff --git a/unittests/test_cmd_connect.h b/tests/unittests/test_cmd_connect.h similarity index 100% rename from unittests/test_cmd_connect.h rename to tests/unittests/test_cmd_connect.h diff --git a/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c similarity index 100% rename from unittests/test_cmd_disconnect.c rename to tests/unittests/test_cmd_disconnect.c diff --git a/unittests/test_cmd_disconnect.h b/tests/unittests/test_cmd_disconnect.h similarity index 100% rename from unittests/test_cmd_disconnect.h rename to tests/unittests/test_cmd_disconnect.h diff --git a/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c similarity index 100% rename from unittests/test_cmd_join.c rename to tests/unittests/test_cmd_join.c diff --git a/unittests/test_cmd_join.h b/tests/unittests/test_cmd_join.h similarity index 100% rename from unittests/test_cmd_join.h rename to tests/unittests/test_cmd_join.h diff --git a/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c similarity index 100% rename from unittests/test_cmd_otr.c rename to tests/unittests/test_cmd_otr.c diff --git a/unittests/test_cmd_otr.h b/tests/unittests/test_cmd_otr.h similarity index 100% rename from unittests/test_cmd_otr.h rename to tests/unittests/test_cmd_otr.h diff --git a/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c similarity index 100% rename from unittests/test_cmd_rooms.c rename to tests/unittests/test_cmd_rooms.c diff --git a/unittests/test_cmd_rooms.h b/tests/unittests/test_cmd_rooms.h similarity index 100% rename from unittests/test_cmd_rooms.h rename to tests/unittests/test_cmd_rooms.h diff --git a/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c similarity index 100% rename from unittests/test_cmd_roster.c rename to tests/unittests/test_cmd_roster.c diff --git a/unittests/test_cmd_roster.h b/tests/unittests/test_cmd_roster.h similarity index 100% rename from unittests/test_cmd_roster.h rename to tests/unittests/test_cmd_roster.h diff --git a/unittests/test_cmd_statuses.c b/tests/unittests/test_cmd_statuses.c similarity index 100% rename from unittests/test_cmd_statuses.c rename to tests/unittests/test_cmd_statuses.c diff --git a/unittests/test_cmd_statuses.h b/tests/unittests/test_cmd_statuses.h similarity index 100% rename from unittests/test_cmd_statuses.h rename to tests/unittests/test_cmd_statuses.h diff --git a/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c similarity index 100% rename from unittests/test_cmd_sub.c rename to tests/unittests/test_cmd_sub.c diff --git a/unittests/test_cmd_sub.h b/tests/unittests/test_cmd_sub.h similarity index 100% rename from unittests/test_cmd_sub.h rename to tests/unittests/test_cmd_sub.h diff --git a/unittests/test_common.c b/tests/unittests/test_common.c similarity index 100% rename from unittests/test_common.c rename to tests/unittests/test_common.c diff --git a/unittests/test_common.h b/tests/unittests/test_common.h similarity index 100% rename from unittests/test_common.h rename to tests/unittests/test_common.h diff --git a/unittests/test_contact.c b/tests/unittests/test_contact.c similarity index 100% rename from unittests/test_contact.c rename to tests/unittests/test_contact.c diff --git a/unittests/test_contact.h b/tests/unittests/test_contact.h similarity index 100% rename from unittests/test_contact.h rename to tests/unittests/test_contact.h diff --git a/unittests/test_form.c b/tests/unittests/test_form.c similarity index 100% rename from unittests/test_form.c rename to tests/unittests/test_form.c diff --git a/unittests/test_form.h b/tests/unittests/test_form.h similarity index 100% rename from unittests/test_form.h rename to tests/unittests/test_form.h diff --git a/unittests/test_jid.c b/tests/unittests/test_jid.c similarity index 100% rename from unittests/test_jid.c rename to tests/unittests/test_jid.c diff --git a/unittests/test_jid.h b/tests/unittests/test_jid.h similarity index 100% rename from unittests/test_jid.h rename to tests/unittests/test_jid.h diff --git a/unittests/test_keyhandlers.c b/tests/unittests/test_keyhandlers.c similarity index 100% rename from unittests/test_keyhandlers.c rename to tests/unittests/test_keyhandlers.c diff --git a/unittests/test_keyhandlers.h b/tests/unittests/test_keyhandlers.h similarity index 100% rename from unittests/test_keyhandlers.h rename to tests/unittests/test_keyhandlers.h diff --git a/unittests/test_muc.c b/tests/unittests/test_muc.c similarity index 100% rename from unittests/test_muc.c rename to tests/unittests/test_muc.c diff --git a/unittests/test_muc.h b/tests/unittests/test_muc.h similarity index 100% rename from unittests/test_muc.h rename to tests/unittests/test_muc.h diff --git a/unittests/test_parser.c b/tests/unittests/test_parser.c similarity index 100% rename from unittests/test_parser.c rename to tests/unittests/test_parser.c diff --git a/unittests/test_parser.h b/tests/unittests/test_parser.h similarity index 100% rename from unittests/test_parser.h rename to tests/unittests/test_parser.h diff --git a/unittests/test_preferences.c b/tests/unittests/test_preferences.c similarity index 100% rename from unittests/test_preferences.c rename to tests/unittests/test_preferences.c diff --git a/unittests/test_preferences.h b/tests/unittests/test_preferences.h similarity index 100% rename from unittests/test_preferences.h rename to tests/unittests/test_preferences.h diff --git a/unittests/test_roster_list.c b/tests/unittests/test_roster_list.c similarity index 100% rename from unittests/test_roster_list.c rename to tests/unittests/test_roster_list.c diff --git a/unittests/test_roster_list.h b/tests/unittests/test_roster_list.h similarity index 100% rename from unittests/test_roster_list.h rename to tests/unittests/test_roster_list.h diff --git a/unittests/test_server_events.c b/tests/unittests/test_server_events.c similarity index 100% rename from unittests/test_server_events.c rename to tests/unittests/test_server_events.c diff --git a/unittests/test_server_events.h b/tests/unittests/test_server_events.h similarity index 100% rename from unittests/test_server_events.h rename to tests/unittests/test_server_events.h diff --git a/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c similarity index 99% rename from unittests/ui/stub_ui.c rename to tests/unittests/ui/stub_ui.c index 0052bfc8..1289aa4b 100644 --- a/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -7,7 +7,7 @@ #include "ui/window.h" #include "ui/ui.h" -#include "unittests/ui/stub_ui.h" +#include "tests/unittests/ui/stub_ui.h" // mock state diff --git a/unittests/ui/stub_ui.h b/tests/unittests/ui/stub_ui.h similarity index 100% rename from unittests/ui/stub_ui.h rename to tests/unittests/ui/stub_ui.h diff --git a/unittests/unittests.c b/tests/unittests/unittests.c similarity index 100% rename from unittests/unittests.c rename to tests/unittests/unittests.c diff --git a/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c similarity index 100% rename from unittests/xmpp/stub_xmpp.c rename to tests/unittests/xmpp/stub_xmpp.c