turn on the utests bulding and fix svace issues

Change-Id: I415aa6f56e579400f3942e334e9ba7d7549ca23c
Signed-off-by: Konstantin Drabeniuk <k.drabeniuk@samsung.com>

diff --git a/packaging/libtbm.spec b/packaging/libtbm.spec
index 70b478a..b824d1a 100644 (file)
--- a/packaging/libtbm.spec
+++ b/packaging/libtbm.spec
@@ -1,6 +1,6 @@
 %bcond_with x
 %bcond_with wayland
-%define UTEST_PACKAGE 0
+%define UTEST_PACKAGE 1
 
 Name:           libtbm
 Version:        2.1.7

diff --git a/src/tbm_surface_queue.c b/src/tbm_surface_queue.c
index 762c89c..9fe4066 100644 (file)
--- a/src/tbm_surface_queue.c
+++ b/src/tbm_surface_queue.c
@@ -1214,13 +1214,13 @@ tbm_surface_queue_dequeue(tbm_surface_queue_h
 
        _tbm_surf_queue_mutex_lock();
 
-       *surface = NULL;
-
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue),
                               TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE);
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(surface != NULL,
                               TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE);
 
+       *surface = NULL;
+
        pthread_mutex_lock(&surface_queue->lock);
 
        if (_queue_is_empty(&surface_queue->free_queue)) {
@@ -1848,13 +1848,13 @@ tbm_surface_queue_get_surfaces(tbm_surface_queue_h surface_queue,
 
        _tbm_surf_queue_mutex_lock();
 
-       *num = 0;
-
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue),
                               TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE);
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(num != NULL,
                               TBM_SURFACE_QUEUE_ERROR_INVALID_PARAMETER);
 
+       *num = 0;
+
        pthread_mutex_lock(&surface_queue->lock);
 
        LIST_FOR_EACH_ENTRY(node, &surface_queue->list, link) {
@@ -1877,13 +1877,13 @@ tbm_surface_queue_get_trace_surface_num(
 {
        _tbm_surf_queue_mutex_lock();
 
-       *num = 0;
-
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue),
                               TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE);
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(num != NULL,
                               TBM_SURFACE_QUEUE_ERROR_INVALID_PARAMETER);
 
+       *num = 0;
+
        pthread_mutex_lock(&surface_queue->lock);
 
        switch (trace) {

diff --git a/utests/ut_tbm_surface_internal.cpp b/utests/ut_tbm_surface_internal.cpp
index 664fe78..572453e 100644 (file)
--- a/utests/ut_tbm_surface_internal.cpp
+++ b/utests/ut_tbm_surface_internal.cpp
@@ -93,14 +93,16 @@ TEST_F(UtInit, SurfaceInteranlDestroyFailTwice)
        tbm_format *formats = NULL;
 
        ASSERT_TRUE(tbm_surface_internal_query_supported_formats(&formats, &num));
+       ASSERT_TRUE(formats != NULL);
+       ASSERT_TRUE(num > 0);
+
        surface = tbm_surface_internal_create_with_flags(720, 1024, formats[0], TBM_BO_DEFAULT);
 
        tbm_surface_internal_destroy(surface);
 
        tbm_surface_internal_destroy(surface);
 
-       if(formats)
-               free(formats);
+       free(formats);
 }
 
 
@@ -352,7 +354,7 @@ TEST_F(UtSurfaceInternal, GetPlaneDataFailInvaildInput)
 
        ASSERT_FALSE(tbm_surface_internal_get_plane_data((tbm_surface_h)&surf, 0, NULL, NULL, NULL));
        ASSERT_FALSE(tbm_surface_internal_get_plane_data(surface, -1, NULL, NULL, NULL));
-       ASSERT_FALSE(tbm_surface_internal_get_plane_data(surface, 4, NULL, NULL, NULL));
+       ASSERT_FALSE(tbm_surface_internal_get_plane_data(surface, 3, NULL, NULL, NULL));
 }
 
 TEST_F(UtSurfaceInternal, GetPlaneDataSuccess)
@@ -456,13 +458,13 @@ TEST_F(UtSurfaceInternal, AddUserDataFailInvaildInput)
 
 TEST_F(UtSurfaceInternal, AddUserDataSuccess)
 {
-       unsigned long key_ud;
+       unsigned long key_ud = 157;
        ASSERT_TRUE(tbm_surface_internal_add_user_data(surface, key_ud, NULL));
 }
 
 TEST_F(UtSurfaceInternal, AddUserDataFailDoubleKey)
 {
-       unsigned long key_ud;
+       unsigned long key_ud = 5487;
        ASSERT_TRUE(tbm_surface_internal_add_user_data(surface, key_ud, NULL));
 
        ASSERT_FALSE(tbm_surface_internal_add_user_data(surface, key_ud, NULL));
@@ -490,7 +492,7 @@ TEST_F(UtSurfaceInternal, SetUserDataFailInvaildInput)
 
 TEST_F(UtSurfaceInternal, SetUserDataSuccess)
 {
-       unsigned long key_ud;
+       unsigned long key_ud = 87947;
        ASSERT_TRUE(tbm_surface_internal_add_user_data(surface, key_ud, data_free_handle));
 
        /*the first call*/
@@ -533,7 +535,7 @@ TEST_F(UtSurfaceInternal, GetUserDataFailInvaildInput)
 
 TEST_F(UtSurfaceInternal, GetUserDataSuccess)
 {
-       unsigned long key_ud;
+       unsigned long key_ud = 97456789;
        int *data = NULL;
 
        ASSERT_TRUE(tbm_surface_internal_add_user_data(surface, key_ud, data_free_handle));
@@ -567,7 +569,7 @@ TEST_F(UtSurfaceInternal, DeleteUserDataFailInvaildInput)
 
 TEST_F(UtSurfaceInternal, DeleteUserDataSuccess)
 {
-       unsigned long key_ud;
+       unsigned long key_ud = 9787524897;
 
        ASSERT_TRUE(tbm_surface_internal_add_user_data(surface, key_ud, data_free_handle));
        ASSERT_TRUE(tbm_surface_internal_set_user_data(surface, key_ud, &tbm_data_free_is_called));