aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-29 11:34:44 -0500
committerTed Gould <ted@canonical.com>2009-10-29 11:34:44 -0500
commitfc573dc11ca279d7a6aaf3c5164fb6e772f8d37c (patch)
treebe51c51cb42bded5f93de281ef6208e836273182
parentec0809ed60a94f582ad7111a992fa0f60e493016 (diff)
downloadlibayatana-indicator-fc573dc11ca279d7a6aaf3c5164fb6e772f8d37c.tar.gz
libayatana-indicator-fc573dc11ca279d7a6aaf3c5164fb6e772f8d37c.tar.bz2
libayatana-indicator-fc573dc11ca279d7a6aaf3c5164fb6e772f8d37c.zip
Creating a new test and linking it into things.
-rw-r--r--.bzrignore1
-rw-r--r--tests/Makefile.am18
-rw-r--r--tests/service-shutdown-timeout.c45
3 files changed, 63 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 0213668..1068e99 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -121,3 +121,4 @@ libindicator/indicator-service-client.h
libindicator/indicator-service-server.h
libindicator/libindicator_la-indicator-service.lo
libindicator/libindicator_la-indicator-service-manager.lo
+tests/service-shutdown-timeout
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8121136..fc83186 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
check_PROGRAMS = \
- test-loader
+ test-loader \
+ service-shutdown-timeout
lib_LTLIBRARIES = \
libdummy-indicator-blank.la \
@@ -77,6 +78,21 @@ libdummy_indicator_simple_la_LDFLAGS = \
-avoid-version
#############################
+# Service Shutdown Timeout
+#############################
+
+service_shutdown_timeout_SOURCES = \
+ service-shutdown-timeout.c
+
+service_shutdown_timeout_CFLAGS = \
+ -Wall -Werror \
+ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_shutdown_timeout_LDADD = \
+ $(LIBINDICATOR_LIBS) \
+ $(top_builddir)/libindicator/.libs/libindicator.a
+
+#############################
# Test stuff
#############################
diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c
new file mode 100644
index 0000000..9682202
--- /dev/null
+++ b/tests/service-shutdown-timeout.c
@@ -0,0 +1,45 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+ passed = FALSE;
+ g_error("Timeout with no shutdown.");
+ g_main_loop_quit(mainloop);
+ return FALSE;
+}
+
+void
+shutdown (void)
+{
+ g_debug("Shutdown");
+ g_main_loop_quit(mainloop);
+ return;
+}
+
+int
+main (int argc, char ** argv)
+{
+ g_type_init();
+
+ IndicatorService * is = indicator_service_new("my.test.name");
+ g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
+
+ g_timeout_add_seconds(1, timeout, NULL);
+
+ mainloop = g_main_loop_new(NULL, FALSE);
+ g_main_loop_run(mainloop);
+
+ g_debug("Quiting");
+ if (passed) {
+ g_debug("Passed");
+ return 0;
+ }
+ g_debug("Failed");
+ return 1;
+}