[mms-lib] Fixed tests

sailfishos · Feb 27, 2014 · e4e1f4d · e4e1f4d
1 parent 6ce35b6
commit e4e1f4d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/mms-lib/test/common/Makefile b/mms-lib/test/common/Makefile
@@ -18,7 +18,7 @@ endif
 #
 # Required packages
 #
-LIB_PKGS = libwspcodec libsoup-2.4 glib-2.0
+LIB_PKGS = libwspcodec libsoup-2.4 glib-2.0 ImageMagick
 PKGS = $(LIB_PKGS)
 
 #
@@ -71,7 +71,7 @@ RELEASE_FLAGS = $(BASE_FLAGS) -O2
 DEBUG_DEFS = -DDEBUG
 RELEASE_DEFS =
 WARNINGS = -Wall
-LIBS = $(shell pkg-config --libs $(LIB_PKGS)) -lmagic
+LIBS = $(shell pkg-config --libs $(LIB_PKGS)) -lmagic -ljpeg
 CFLAGS = $(shell pkg-config --cflags $(PKGS)) -I$(MMS_LIB_DIR)/include \
   -I$(MMS_LIB_DIR)/src -I$(COMMON_DIR) -MMD
 

diff --git a/mms-lib/test/read_report/test_read_report.c b/mms-lib/test/read_report/test_read_report.c
@@ -150,7 +150,7 @@ int main(int argc, char* argv[])
     int ret;
     MMSConfig config;
     char* tmpd = g_mkdtemp(g_strdup("/tmp/test_retrieve_XXXXXX"));
-    mms_lib_init();
+    mms_lib_init(argv[0]);
     mms_lib_default_config(&config);
     config.idle_secs = 0;
     config.root_dir = tmpd;
@@ -168,6 +168,7 @@ int main(int argc, char* argv[])
     ret = test_read_report(&config);
     remove(tmpd);
     g_free(tmpd);
+    mms_lib_deinit();
     return ret;
 }
 

diff --git a/mms-lib/test/retrieve/test_retrieve.c b/mms-lib/test/retrieve/test_retrieve.c
@@ -438,10 +438,11 @@ test_retrieve(
 
 int main(int argc, char* argv[])
 {
+    int ret;
     MMSConfig config;
     const char* test_name = NULL;
 
-    mms_lib_init();
+    mms_lib_init(argv[0]);
     mms_lib_default_config(&config);
     mms_log_default.name = "test_retrieve";
 
@@ -463,7 +464,6 @@ int main(int argc, char* argv[])
     }
 
     if (argc == 1 || test_name) {
-        int ret;
         char* tmpd = g_mkdtemp(g_strdup("/tmp/test_retrieve_XXXXXX"));
         MMS_VERBOSE("Temporary directory %s", tmpd);
         config.root_dir = tmpd;
@@ -472,11 +472,13 @@ int main(int argc, char* argv[])
         ret = test_retrieve(&config, test_name);
         remove(tmpd);
         g_free(tmpd);
-        return ret;
     } else {
         printf("Usage: test_retrieve [-v] [TEST]\n");
-        return RET_ERR;
+        ret = RET_ERR;
     }
+
+    mms_lib_deinit();
+    return ret;
 }
 
 /*

diff --git a/mms-lib/test/retrieve_cancel/test_retrieve_cancel.c b/mms-lib/test/retrieve_cancel/test_retrieve_cancel.c
@@ -261,8 +261,9 @@ test(
 
 int main(int argc, char* argv[])
 {
+    int ret;
     MMSConfig config;
-    mms_lib_init();
+    mms_lib_init(argv[0]);
     mms_lib_default_config(&config);
     config.retry_secs = 0;
     config.root_dir = "."; /* Dispatcher will attempt to create it */
@@ -274,7 +275,9 @@ int main(int argc, char* argv[])
         mms_log_stdout_timestamp = FALSE;
         mms_log_default.level = MMS_LOGLEVEL_INFO;
     }
-    return test(&config);
+    ret = test(&config);
+    mms_lib_deinit();
+    return ret;
 }
 
 /*

diff --git a/mms-lib/test/retrieve_no_proxy/test_retrieve_no_proxy.c b/mms-lib/test/retrieve_no_proxy/test_retrieve_no_proxy.c
@@ -221,9 +221,10 @@ test_retrieve_no_proxy(
 
 int main(int argc, char* argv[])
 {
+    int ret;
     MMSConfig config;
 
-    mms_lib_init();
+    mms_lib_init(argv[0]);
     mms_lib_default_config(&config);
     mms_log_default.name = "test_retrieve_no_proxy";
 
@@ -239,7 +240,6 @@ int main(int argc, char* argv[])
     }
 
     if (argc == 1) {
-        int ret;
         char* tmpd = g_mkdtemp(g_strdup("/tmp/test_retrieve_XXXXXX"));
         MMS_VERBOSE("Temporary directory %s", tmpd);
         config.root_dir = tmpd;
@@ -248,11 +248,13 @@ int main(int argc, char* argv[])
         ret = test_retrieve_no_proxy(&config);
         remove(tmpd);
         g_free(tmpd);
-        return ret;
     } else {
         printf("Usage: test_retrieve [-v] [TEST]\n");
-        return RET_ERR;
+        ret = RET_ERR;
     }
+
+    mms_lib_deinit();
+    return ret;
 }
 
 /*