From 68ed20f10d2fae67b052674a42ed98c2059aa16f Mon Sep 17 00:00:00 2001 From: James Booth Date: Fri, 12 Jun 2015 23:53:30 +0100 Subject: Moved all tests to tests folder --- Makefile.am | 88 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'Makefile.am') 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) -- cgit 1.4.1-2-gfad0