diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tests/.gitignore | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 25 | ||||
| -rw-r--r-- | tests/interactive/.gitignore | 8 | ||||
| -rw-r--r-- | tests/interactive/Makefile.am | 35 | ||||
| -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, 45 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index f1fe9ab2e..67b2d2e4f 100644 --- a/configure.ac +++ b/configure.ac @@ -470,6 +470,7 @@ AC_OUTPUT([ nautilus-sendto-plugin/Makefile help/Makefile tests/Makefile + tests/interactive/Makefile tests/xml/Makefile tools/Makefile shave 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/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 |