diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-30 13:08:35 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-30 13:08:35 +0100 |
| commit | 382886e7dacd79b86dc72a38e9ef32d321d8ab95 (patch) | |
| tree | 71239faee2556a3c755c457e04e9bb89c6a1440f /tests | |
| parent | f8bec1f34af87c4bc044b022abc69f1176ba1f33 (diff) | |
| parent | f333fe80d27ded0882b9301ecab957bbe8d79e5e (diff) | |
Merge branch 'catch-up'
Conflicts:
configure.ac
src/idle-muc-channel.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/test-ctcp-kill-blingbling.c | 4 | ||||
| -rw-r--r-- | tests/test-ctcp-tokenize.c | 4 | ||||
| -rw-r--r-- | tests/test-text-encode-and-split.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5c1133d..295512a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,6 +24,10 @@ AM_CFLAGS = \ @TELEPATHY_CFLAGS@ \ @OPENSSL_CFLAGS@ +AM_LDFLAGS = \ + $(ERROR_LDFLAGS) \ + $(NULL) + ALL_LIBS = \ @DBUS_LIBS@ \ @GLIB_LIBS@ \ diff --git a/tests/test-ctcp-kill-blingbling.c b/tests/test-ctcp-kill-blingbling.c index 192fbb7..559282b 100644 --- a/tests/test-ctcp-kill-blingbling.c +++ b/tests/test-ctcp-kill-blingbling.c @@ -3,7 +3,9 @@ #include <stdio.h> #include <string.h> -int main() { +int +main (void) +{ gboolean fail = FALSE; const gchar *test_strings[] = { diff --git a/tests/test-ctcp-tokenize.c b/tests/test-ctcp-tokenize.c index 6421724..58794d8 100644 --- a/tests/test-ctcp-tokenize.c +++ b/tests/test-ctcp-tokenize.c @@ -6,7 +6,9 @@ #include <telepathy-glib/util.h> -int main() { +int +main (void) +{ gboolean fail = FALSE; const gchar *test_str = "\001 foo \" fo bar\" bar\\001\\002\\003baz\"for every foo there is \\001 bar\\\\\001"; diff --git a/tests/test-text-encode-and-split.c b/tests/test-text-encode-and-split.c index 86cf6ac..c0a6083 100644 --- a/tests/test-text-encode-and-split.c +++ b/tests/test-text-encode-and-split.c @@ -19,7 +19,7 @@ G_STMT_END -gboolean +static gboolean test (TpChannelTextMessageType type, gchar *msg) { |