diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-01 14:20:49 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-01 14:20:49 -0500 |
| commit | 5033744e6115eddb01b77f63f0a6a28b407a34ed (patch) | |
| tree | 71e5751e01c3aa7aec3246b047e40b8174eddc47 | |
| parent | 24ca5a26c8365a326d2911cf590d48b75d6356d4 (diff) | |
| parent | 7efb9a8d35bf22a4b8c289684ef5591f03da9e94 (diff) | |
| download | telepathy-logger-5033744e6115eddb01b77f63f0a6a28b407a34ed.tar.gz | |
Merge branch 'trivia'
| -rw-r--r-- | tests/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/dbus/test-tpl-log-store-sqlite.c (renamed from tests/test-tpl-log-store-sqlite.c) | 0 | ||||
| -rw-r--r-- | tests/dbus/test-tpl-observer.c (renamed from tests/test-tpl-observer.c) | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 388bc63..0e22692 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,8 +9,6 @@ EXTRA_DIST = logs noinst_PROGRAMS = \ test-tpl-channel \ test-tpl-conf \ - test-tpl-log-store-sqlite \ - test-tpl-observer \ $(NULL) TESTS = $(noinst_PROGRAMS) @@ -25,12 +23,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 +56,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..1cca85d 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -2,7 +2,9 @@ noinst_PROGRAMS = \ test-entity \ test-log-manager \ test-tpl-log-store-pidgin \ + test-tpl-log-store-sqlite \ test-tpl-log-store-xml \ + test-tpl-observer \ $(NULL) TESTS = $(noinst_PROGRAMS) diff --git a/tests/test-tpl-log-store-sqlite.c b/tests/dbus/test-tpl-log-store-sqlite.c index 385d618..385d618 100644 --- a/tests/test-tpl-log-store-sqlite.c +++ b/tests/dbus/test-tpl-log-store-sqlite.c 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> |