* unit tests:

  - fix compile warnings

pmo-trunk-r656

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b62ec7..813d483 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,12 +13,10 @@ TESTS                   =                           \
                         check_folder-xfer           \
                        check_text-utils            \
                        check_modest-conf           \
-                        check_update-account        \
                        check_account-mgr           
 
 noinst_PROGRAMS=                                   \
                        check_folder-xfer           \
-                       check_update-account        \
                        check_modest-conf           \
                        check_text-utils            \
                        check_modest-presets        \
@@ -52,6 +50,7 @@ objects=\
         ${top_srcdir}/src/modest-mail-operation-queue.o \
         ${top_srcdir}/src/modest-mail-operation.o \
         ${top_srcdir}/src/modest-tny-msg-actions.o \
+        ${top_srcdir}/src/modest-local-folder-info.o \
         ${top_srcdir}/src/modest-tny-folder.o \
         ${top_srcdir}/src/modest-text-utils.o
 

diff --git a/tests/check_modest-conf.c b/tests/check_modest-conf.c
index c97762a..0cba48d 100644 (file)
--- a/tests/check_modest-conf.c
+++ b/tests/check_modest-conf.c
@@ -29,7 +29,7 @@
 
 #include <check.h>
 #include <modest-conf.h>
-
+#include <string.h>
 
 START_TEST (test_modest_conf_new)
 {

diff --git a/tests/check_modest-presets.c b/tests/check_modest-presets.c
index 67bc763..fd6ba8e 100644 (file)
--- a/tests/check_modest-presets.c
+++ b/tests/check_modest-presets.c
@@ -54,7 +54,7 @@ START_TEST (test_modest_presets_get_providers)
 {
        ModestPresets *presets;
        gchar **providers;
-       int len, i;
+       int len;
        
        presets = modest_presets_new ("provider-data-test.keyfile");
        fail_unless (presets != NULL,

diff --git a/tests/check_text-utils.c b/tests/check_text-utils.c
index 408ab90..e60fdeb 100644 (file)
--- a/tests/check_text-utils.c
+++ b/tests/check_text-utils.c
@@ -707,6 +707,8 @@ START_TEST (test_convert_to_html_regular)
        gchar *html_end = NULL;
        gchar *html = NULL;
        gint bytes;
+       int i;
+
        const StringPair tests[] = {
                { "This is some text.", 
                  "<tt>This is some text.</tt>" },

diff --git a/tests/check_update-account.c b/tests/check_update-account.c
index 48ccd39..31a60d9 100644 (file)
--- a/tests/check_update-account.c
+++ b/tests/check_update-account.c
@@ -49,7 +49,6 @@ GMainLoop *main_loop;
 static void
 on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
 {
-       ModestMailOperationStatus status;
        ModestMailOperationQueue *queue = NULL;
 
        g_print ("Refreshed %d of %d\n", 
@@ -114,7 +113,7 @@ main (int argc, char **argv)
        g_thread_init(NULL);
 
        main_loop = g_main_loop_new (NULL, FALSE);
-        id = g_timeout_add(1000, func, main_loop);
+        id = g_timeout_add(10, func, main_loop);
 
        g_main_loop_run(main_loop);