[empathy] move test app needing user interaction to interactive/

[Guillaume Desmottes <gdesmott src gnome org>]

commit 4c2eb652ef61dd0f5ccac27e47f261417793aa73
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Oct 27 15:22:55 2009 +0000

    move test app needing user interaction to interactive/
    
    tests/ should be used only for automatic unit tests.

 configure.ac                                       |    1 +
 tests/.gitignore                                   |    8 ----
 tests/Makefile.am                                  |   25 +-------------
 tests/interactive/.gitignore                       |    8 ++++
 tests/interactive/Makefile.am                      |   35 ++++++++++++++++++++
 tests/{ => interactive}/contact-manager.c          |    0
 tests/{ => interactive}/empetit.c                  |    0
 .../test-empathy-account-assistant.c               |    0
 .../test-empathy-presence-chooser.c                |    0
 .../test-empathy-protocol-chooser.c                |    0
 .../test-empathy-status-preset-dialog.c            |    0
 11 files changed, 45 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f1fe9ab..67b2d2e 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 a522514..28aa99b 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 ae774b1..a93b6fd 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 0000000..f5c4576
--- /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 0000000..a66f518
--- /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
similarity index 100%
rename from tests/contact-manager.c
rename to tests/interactive/contact-manager.c
diff --git a/tests/empetit.c b/tests/interactive/empetit.c
similarity index 100%
rename from tests/empetit.c
rename to tests/interactive/empetit.c
diff --git a/tests/test-empathy-account-assistant.c b/tests/interactive/test-empathy-account-assistant.c
similarity index 100%
rename from tests/test-empathy-account-assistant.c
rename to tests/interactive/test-empathy-account-assistant.c
diff --git a/tests/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
similarity index 100%
rename from tests/test-empathy-presence-chooser.c
rename to tests/interactive/test-empathy-presence-chooser.c
diff --git a/tests/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
similarity index 100%
rename from tests/test-empathy-protocol-chooser.c
rename to 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
similarity index 100%
rename from tests/test-empathy-status-preset-dialog.c
rename to tests/interactive/test-empathy-status-preset-dialog.c