[evolution-data-server/wip/camel-more-gobject] Always build internal camel tests and fix some compiler warnings in there
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/wip/camel-more-gobject] Always build internal camel tests and fix some compiler warnings in there
- Date: Mon, 7 Nov 2016 12:44:46 +0000 (UTC)
commit 8cacb94aa70e8c50ccc05f8493d7d4b004a3f241
Author: Milan Crha <mcrha redhat com>
Date: Mon Nov 7 13:43:18 2016 +0100
Always build internal camel tests and fix some compiler warnings in there
This way any API changes will be recognized early, rather than when 'make check'
is issued.
src/camel/tests/CMakeLists.txt | 3 ++-
src/camel/tests/folder/test10.c | 3 ++-
src/camel/tests/folder/test11.c | 27 ++++++++++++++-------------
src/camel/tests/folder/test2.c | 2 +-
src/camel/tests/folder/test8.c | 3 ++-
src/camel/tests/lib/messages.c | 8 ++------
src/camel/tests/message/test2.c | 4 ++--
src/camel/tests/mime-filter/test-charset.c | 3 +--
src/camel/tests/misc/split.c | 4 ++--
src/camel/tests/smime/pgp.c | 1 -
10 files changed, 28 insertions(+), 30 deletions(-)
---
diff --git a/src/camel/tests/CMakeLists.txt b/src/camel/tests/CMakeLists.txt
index 652cfc3..d282a30 100644
--- a/src/camel/tests/CMakeLists.txt
+++ b/src/camel/tests/CMakeLists.txt
@@ -1,7 +1,8 @@
macro(add_camel_test_one _part _name _src_file)
set(_test_ident cameltest-${_part}-${_name})
- add_executable(${_test_ident} EXCLUDE_FROM_ALL ${_src_file})
+ # Not using EXCLUDE_FROM_ALL here, to have these built always
+ add_executable(${_test_ident} ${_src_file})
target_compile_definitions(${_test_ident} PRIVATE
-DG_LOG_DOMAIN=\"${_test_ident}\"
diff --git a/src/camel/tests/folder/test10.c b/src/camel/tests/folder/test10.c
index 5331df9..4d23126 100644
--- a/src/camel/tests/folder/test10.c
+++ b/src/camel/tests/folder/test10.c
@@ -101,7 +101,8 @@ main (gint argc,
for (i = 0; i < MAX_THREADS; i++) {
GError *error = NULL;
- threads[i] = g_thread_new (NULL, worker, NULL);
+ threads[i] = g_thread_try_new (NULL, worker, NULL, &error);
+ check_msg (error == NULL, "g_thread_try_new() failed: %s", error->message);
}
for (i = 0; i < MAX_THREADS; i++) {
diff --git a/src/camel/tests/folder/test11.c b/src/camel/tests/folder/test11.c
index 3727720..6fd7c6f 100644
--- a/src/camel/tests/folder/test11.c
+++ b/src/camel/tests/folder/test11.c
@@ -22,6 +22,7 @@
#define MAX_LOOP (10000)
#define MAX_THREADS (5)
+#define GC(x) ((gchar *) (x))
static const gchar *local_drivers[] = { "local" };
@@ -30,25 +31,25 @@ static CamelSession *session;
/* FIXME: flags aren't really right yet */
/* ASCII sorted on full_name */
static CamelFolderInfo fi_list_1[] = {
- { NULL, NULL, NULL, ".", "Inbox", CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1, -1 },
- { NULL, NULL, NULL, ".#evolution/Junk", "Junk", CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1, -1
},
- { NULL, NULL, NULL, ".#evolution/Trash", "Trash", CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1,
-1 },
- { NULL, NULL, NULL, "testbox", "testbox", CAMEL_FOLDER_CHILDREN, -1, -1 },
- { NULL, NULL, NULL, "testbox/foo", "foo", CAMEL_FOLDER_NOCHILDREN, -1, -1 },
- { NULL, NULL, NULL, "testbox2", "testbox2", CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("."), GC ("Inbox"), CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC (".#evolution/Junk"), GC ("Junk"), CAMEL_FOLDER_SYSTEM |
CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC (".#evolution/Trash"), GC ("Trash"), CAMEL_FOLDER_SYSTEM |
CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox"), GC ("testbox"), CAMEL_FOLDER_CHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox/foo"), GC ("foo"), CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox2"), GC ("testbox2"), CAMEL_FOLDER_NOCHILDREN, -1, -1 },
};
static CamelFolderInfo fi_list_2[] = {
- { NULL, NULL, NULL, ".", "Inbox", CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1, -1 },
- { NULL, NULL, NULL, ".#evolution/Junk", "Junk", CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1, -1
},
- { NULL, NULL, NULL, ".#evolution/Trash", "Trash", CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1,
-1 },
- { NULL, NULL, NULL, "testbox", "testbox", CAMEL_FOLDER_NOCHILDREN, -1, -1 },
- { NULL, NULL, NULL, "testbox2", "testbox2", CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("."), GC ("Inbox"), CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC (".#evolution/Junk"), GC ("Junk"), CAMEL_FOLDER_SYSTEM |
CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC (".#evolution/Trash"), GC ("Trash"), CAMEL_FOLDER_SYSTEM |
CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox"), GC ("testbox"), CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox2"), GC ("testbox2"), CAMEL_FOLDER_NOCHILDREN, -1, -1 },
};
static CamelFolderInfo fi_list_3[] = {
- { NULL, NULL, NULL, "testbox", "testbox", CAMEL_FOLDER_CHILDREN, -1, -1 },
- { NULL, NULL, NULL, "testbox/foo", "foo", CAMEL_FOLDER_NOCHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox"), GC ("testbox"), CAMEL_FOLDER_CHILDREN, -1, -1 },
+ { NULL, NULL, NULL, GC ("testbox/foo"), GC ("foo"), CAMEL_FOLDER_NOCHILDREN, -1, -1 },
};
static gint
diff --git a/src/camel/tests/folder/test2.c b/src/camel/tests/folder/test2.c
index 85b66ff..b43bb0e 100644
--- a/src/camel/tests/folder/test2.c
+++ b/src/camel/tests/folder/test2.c
@@ -47,7 +47,7 @@ gint main (gint argc, gchar **argv)
/* we iterate over all stores we want to test, with indexing or indexing turned on or off */
for (i = 0; i < G_N_ELEMENTS (stores); i++) {
- gchar *name = stores[i];
+ const gchar *name = stores[i];
test_folder_message_ops (session, name, TRUE, "testbox");
}
diff --git a/src/camel/tests/folder/test8.c b/src/camel/tests/folder/test8.c
index 1a56706..1c5ee94 100644
--- a/src/camel/tests/folder/test8.c
+++ b/src/camel/tests/folder/test8.c
@@ -193,7 +193,8 @@ gint main (gint argc, gchar **argv)
info->id = i * MAX_MESSAGES;
info->folder = folder;
- threads[i] = g_thread_new (NULL, worker, info);
+ threads[i] = g_thread_try_new (NULL, worker, info, &error);
+ check_msg (error == NULL, "g_thread_try_new() failed: %s", error->message);
}
for (i = 0; i < MAX_THREADS; i++) {
diff --git a/src/camel/tests/lib/messages.c b/src/camel/tests/lib/messages.c
index dbe674b..ea7b0a0 100644
--- a/src/camel/tests/lib/messages.c
+++ b/src/camel/tests/lib/messages.c
@@ -238,8 +238,6 @@ test_message_compare (CamelMimeMessage *msg)
g_seekable_seek (G_SEEKABLE (stream2), 0, G_SEEK_SET, NULL, NULL);
if (byte_array1->len != byte_array2->len) {
- CamelDataWrapper *content;
-
printf ("stream1 stream:\n%.*s\n", byte_array1->len, byte_array1->data);
printf ("stream2 stream:\n%.*s\n\n", byte_array2->len, byte_array2->data);
@@ -247,8 +245,6 @@ test_message_compare (CamelMimeMessage *msg)
test_message_dump_structure (msg);
printf ("msg2:\n");
test_message_dump_structure (msg2);
-
- content = camel_medium_get_content ((CamelMedium *) msg);
}
check_unref (msg2, 1);
@@ -298,7 +294,7 @@ message_dump_rec (CamelMimeMessage *msg,
printf ("%sPart <%s>\n", s, G_OBJECT_TYPE_NAME (part));
printf ("%sContent-Type: %s\n", s, mime_type);
g_free (mime_type);
- printf ("%s encoding: %s\n", s, camel_transfer_encoding_to_string (((CamelDataWrapper *)
part)->encoding));
+ printf ("%s encoding: %s\n", s, camel_transfer_encoding_to_string (camel_data_wrapper_get_encoding
((CamelDataWrapper *) part)));
printf ("%s part encoding: %s\n", s, camel_transfer_encoding_to_string (camel_mime_part_get_encoding
(part)));
containee = camel_medium_get_content (CAMEL_MEDIUM (part));
@@ -310,7 +306,7 @@ message_dump_rec (CamelMimeMessage *msg,
printf ("%sContent <%s>\n", s, G_OBJECT_TYPE_NAME (containee));
printf ("%sContent-Type: %s\n", s, mime_type);
g_free (mime_type);
- printf ("%s encoding: %s\n", s, camel_transfer_encoding_to_string (((CamelDataWrapper *)
containee)->encoding));
+ printf ("%s encoding: %s\n", s, camel_transfer_encoding_to_string (camel_data_wrapper_get_encoding
((CamelDataWrapper *) containee)));
/* using the object types is more accurate than using the mime/types */
if (CAMEL_IS_MULTIPART (containee)) {
diff --git a/src/camel/tests/message/test2.c b/src/camel/tests/message/test2.c
index ada3c1d..f00e23a 100644
--- a/src/camel/tests/message/test2.c
+++ b/src/camel/tests/message/test2.c
@@ -41,13 +41,13 @@ static gchar *convert (const gchar *in, const gchar *from, const gchar *to)
outp = out = g_malloc (outlen);
inp = in;
- if (iconv (ic, &inp, &inlen, &outp, &outlen) == -1) {
+ if (camel_iconv (ic, &inp, &inlen, &outp, &outlen) == -1) {
test_free (out);
g_iconv_close (ic);
return g_strdup (in);
}
- if (iconv (ic, NULL, 0, &outp, &outlen) == -1) {
+ if (camel_iconv (ic, NULL, 0, &outp, &outlen) == -1) {
test_free (out);
g_iconv_close (ic);
return g_strdup (in);
diff --git a/src/camel/tests/mime-filter/test-charset.c b/src/camel/tests/mime-filter/test-charset.c
index c490396..c68e688 100644
--- a/src/camel/tests/mime-filter/test-charset.c
+++ b/src/camel/tests/mime-filter/test-charset.c
@@ -80,8 +80,7 @@ test_case (const gchar *basename)
}
g_free (filename);
- filename = g_strdup_printf (
- "%s/%.*s.out", SOURCEDIR, ext - basename, basename);
+ filename = g_strdup_printf ("%s/%.*s.out", SOURCEDIR, (gint) (ext - basename), basename);
file = g_file_new_for_path (filename);
correct_stream = g_file_read (file, NULL, &local_error);
diff --git a/src/camel/tests/misc/split.c b/src/camel/tests/misc/split.c
index eac9548..9f7f418 100644
--- a/src/camel/tests/misc/split.c
+++ b/src/camel/tests/misc/split.c
@@ -78,7 +78,7 @@ main (gint argc,
for (i = 0; i < G_N_ELEMENTS (split_tests); i++) {
camel_test_push ("split %d '%s'", i, split_tests[i].word);
- words = camel_search_words_split (split_tests[i].word);
+ words = camel_search_words_split ((const guchar *) split_tests[i].word);
check (words != NULL);
check_msg (words->len == split_tests[i].count, "words->len = %d, count = %d", words->len,
split_tests[i].count);
@@ -100,7 +100,7 @@ main (gint argc,
for (i = 0; i < G_N_ELEMENTS (simple_tests); i++) {
camel_test_push ("simple split %d '%s'", i, simple_tests[i].word);
- tmp = camel_search_words_split (simple_tests[i].word);
+ tmp = camel_search_words_split ((const guchar *) simple_tests[i].word);
check (tmp != NULL);
words = camel_search_words_simple (tmp);
diff --git a/src/camel/tests/smime/pgp.c b/src/camel/tests/smime/pgp.c
index 05f7771..139aa3c 100644
--- a/src/camel/tests/smime/pgp.c
+++ b/src/camel/tests/smime/pgp.c
@@ -49,7 +49,6 @@ G_DEFINE_TYPE (CamelPgpSession, camel_pgp_session, camel_test_session_get_type (
static gchar *
pgp_session_get_password (CamelSession *session,
CamelService *service,
- const gchar *domain,
const gchar *prompt,
const gchar *item,
guint32 flags,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
