aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/.gitignore8
-rw-r--r--tests/Makefile.am25
-rw-r--r--tests/check-empathy-irc-network-manager.c6
-rw-r--r--tests/interactive/.gitignore8
-rw-r--r--tests/interactive/Makefile.am35
-rw-r--r--tests/interactive/contact-manager.c (renamed from tests/contact-manager.c)0
-rw-r--r--tests/interactive/empetit.c (renamed from tests/empetit.c)0
-rw-r--r--tests/interactive/test-empathy-account-assistant.c (renamed from tests/test-empathy-account-assistant.c)0
-rw-r--r--tests/interactive/test-empathy-presence-chooser.c (renamed from tests/test-empathy-presence-chooser.c)0
-rw-r--r--tests/interactive/test-empathy-protocol-chooser.c (renamed from tests/test-empathy-protocol-chooser.c)0
-rw-r--r--tests/interactive/test-empathy-status-preset-dialog.c (renamed from tests/test-empathy-status-preset-dialog.c)0
11 files changed, 44 insertions, 38 deletions
diff --git a/tests/.gitignore b/tests/.gitignore
index a522514bd..28aa99b06 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,10 +1,2 @@
check-main
-contact-manager
-contact-run-until-ready
-contact-run-until-ready-2
*.log
-empetit
-test-empathy-account-assistant
-test-empathy-presence-chooser
-test-empathy-status-preset-dialog
-test-empathy-protocol-chooser
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae774b138..a93b6fd8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = xml
+SUBDIRS = interactive xml
CLEANFILES=
@@ -23,29 +23,6 @@ LDADD = \
$(top_builddir)/libempathy/libempathy.la \
$(EMPATHY_LIBS)
-noinst_PROGRAMS = \
- contact-manager \
- empetit \
- test-empathy-account-assistant \
- test-empathy-presence-chooser \
- test-empathy-status-preset-dialog \
- test-empathy-protocol-chooser
-
-contact_manager_SOURCES = contact-manager.c
-empetit_SOURCES = empetit.c
-test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
-test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
-test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c
-test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c
-
-test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src
-test_empathy_account_assistant_LDADD = \
- $(top_builddir)/src/empathy-account-assistant.o \
- $(top_builddir)/src/empathy-import-utils.o \
- $(top_builddir)/src/empathy-import-pidgin.o \
- $(top_builddir)/src/empathy-import-widget.o \
- $(LDADD)
-
check_PROGRAMS = check-main
TESTS = check-main
check_main_SOURCES = \
diff --git a/tests/check-empathy-irc-network-manager.c b/tests/check-empathy-irc-network-manager.c
index 7b3562020..51666fc46 100644
--- a/tests/check-empathy-irc-network-manager.c
+++ b/tests/check-empathy-irc-network-manager.c
@@ -440,7 +440,6 @@ START_TEST (test_modify_user_file)
/* check networks and servers */
for (l = networks; l != NULL; l = g_slist_next (l))
{
- EmpathyIrcNetwork *network;
gchar *name;
network = l->data;
@@ -457,7 +456,6 @@ START_TEST (test_modify_user_file)
servers = empathy_irc_network_get_servers (network);
for (ll = servers; ll != NULL; ll = g_slist_next (ll))
{
- EmpathyIrcServer *server;
gchar *address;
server = ll->data;
@@ -613,7 +611,6 @@ START_TEST (test_modify_both_files)
/* check networks and servers */
for (l = networks; l != NULL; l = g_slist_next (l))
{
- EmpathyIrcNetwork *network;
gchar *name;
network = l->data;
@@ -628,7 +625,6 @@ START_TEST (test_modify_both_files)
servers = empathy_irc_network_get_servers (network);
for (ll = servers; ll != NULL; ll = g_slist_next (ll))
{
- EmpathyIrcServer *server;
gchar *address;
server = ll->data;
@@ -676,8 +672,6 @@ START_TEST (test_modify_both_files)
else if (strcmp (name, "Undernet") == 0)
{
/* modify global network */
- EmpathyIrcServer *server;
-
server = empathy_irc_server_new ("us.undernet.org", 6667, FALSE);
empathy_irc_network_append_server (network, server);
g_object_unref (server);
diff --git a/tests/interactive/.gitignore b/tests/interactive/.gitignore
new file mode 100644
index 000000000..f5c45764e
--- /dev/null
+++ b/tests/interactive/.gitignore
@@ -0,0 +1,8 @@
+contact-manager
+contact-run-until-ready
+contact-run-until-ready-2
+empetit
+test-empathy-account-assistant
+test-empathy-presence-chooser
+test-empathy-status-preset-dialog
+test-empathy-protocol-chooser
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
new file mode 100644
index 000000000..a66f518e9
--- /dev/null
+++ b/tests/interactive/Makefile.am
@@ -0,0 +1,35 @@
+AM_CPPFLAGS = \
+ $(ERROR_CFLAGS) \
+ -I$(top_srcdir) \
+ -DPKGDATADIR=\""$(pkgdatadir)"\" \
+ $(EMPATHY_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(DISABLE_DEPRECATED)
+
+LDADD = \
+ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \
+ $(top_builddir)/libempathy/libempathy.la \
+ $(EMPATHY_LIBS)
+
+noinst_PROGRAMS = \
+ contact-manager \
+ empetit \
+ test-empathy-account-assistant \
+ test-empathy-presence-chooser \
+ test-empathy-status-preset-dialog \
+ test-empathy-protocol-chooser
+
+contact_manager_SOURCES = contact-manager.c
+empetit_SOURCES = empetit.c
+test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
+test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
+test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c
+test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c
+
+test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src
+test_empathy_account_assistant_LDADD = \
+ $(top_builddir)/src/empathy-account-assistant.o \
+ $(top_builddir)/src/empathy-import-utils.o \
+ $(top_builddir)/src/empathy-import-pidgin.o \
+ $(top_builddir)/src/empathy-import-widget.o \
+ $(LDADD)
diff --git a/tests/contact-manager.c b/tests/interactive/contact-manager.c
index 7793b44d9..7793b44d9 100644
--- a/tests/contact-manager.c
+++ b/tests/interactive/contact-manager.c
diff --git a/tests/empetit.c b/tests/interactive/empetit.c
index e2eb61f66..e2eb61f66 100644
--- a/tests/empetit.c
+++ b/tests/interactive/empetit.c
diff --git a/tests/test-empathy-account-assistant.c b/tests/interactive/test-empathy-account-assistant.c
index 4f1c9a49b..4f1c9a49b 100644
--- a/tests/test-empathy-account-assistant.c
+++ b/tests/interactive/test-empathy-account-assistant.c
diff --git a/tests/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 12d35b4c6..12d35b4c6 100644
--- a/tests/test-empathy-presence-chooser.c
+++ b/tests/interactive/test-empathy-presence-chooser.c
diff --git a/tests/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
index 90b1797a3..90b1797a3 100644
--- a/tests/test-empathy-protocol-chooser.c
+++ b/tests/interactive/test-empathy-protocol-chooser.c
diff --git a/tests/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index 6602e4f28..6602e4f28 100644
--- a/tests/test-empathy-status-preset-dialog.c
+++ b/tests/interactive/test-empathy-status-preset-dialog.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 13:19:05 +0800