diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-01 14:15:03 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-01 14:17:13 -0500 |
| commit | 6ff3282cd5819897f7b8ad8cd60ca5b0ce1aef74 (patch) | |
| tree | 3867397280372f8aac2e12a5e7e44760916cc747 | |
| parent | 4e8b207a29871f4ddf13019d7ddb5e27430bef37 (diff) | |
| download | telepathy-logger-6ff3282cd5819897f7b8ad8cd60ca5b0ce1aef74.tar.gz | |
Moves observer test with dbus tests
Also removed unused dependency to TplChannelTest.
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/dbus/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/dbus/test-tpl-observer.c (renamed from tests/test-tpl-observer.c) | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 388bc63..ec01564 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,6 @@ noinst_PROGRAMS = \ test-tpl-channel \ test-tpl-conf \ test-tpl-log-store-sqlite \ - test-tpl-observer \ $(NULL) TESTS = $(noinst_PROGRAMS) @@ -25,12 +24,6 @@ test_tpl_channel_SOURCES = \ tpl-channel-test.h \ $(NULL) -test_tpl_observer_SOURCES = \ - test-tpl-observer.c \ - tpl-channel-test.c \ - $(NULL) - - AM_CFLAGS = \ $(ERROR_CFLAGS) \ $(TPL_CFLAGS) \ @@ -64,7 +57,6 @@ check_c_sources = \ tpl-channel-test.c \ test-tpl-channel.c \ test-tpl-conf.c \ - test-tpl-observer.c \ $(NULL) include $(top_srcdir)/tools/check-coding-style.mk diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am index 2465d38..b5868f0 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS = \ test-log-manager \ test-tpl-log-store-pidgin \ test-tpl-log-store-xml \ + test-tpl-observer \ $(NULL) TESTS = $(noinst_PROGRAMS) diff --git a/tests/test-tpl-observer.c b/tests/dbus/test-tpl-observer.c index 896f395..cc78c40 100644 --- a/tests/test-tpl-observer.c +++ b/tests/dbus/test-tpl-observer.c @@ -1,5 +1,3 @@ -#include "tpl-channel-test.h" - #include <telepathy-logger/channel-factory-internal.h> #include <telepathy-logger/observer-internal.h> |