From 8840feb22e16c7d1ad04c1da39a7d9daa7d8df08 Mon Sep 17 00:00:00 2001 From: Roman Marchenko Date: Mon, 18 Dec 2017 16:35:21 +0200 Subject: [PATCH] utest: fix protex issues Change-Id: Icdb641d1bbf34d687b78ea3574dd41c91e8e0ce3 Signed-off-by: Roman Marchenko --- utests/ut_main.cpp | 9 +++++++-- utests/ut_tbm_surface_queue.cpp | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/utests/ut_main.cpp b/utests/ut_main.cpp index 718fa44..eaca3ba 100644 --- a/utests/ut_main.cpp +++ b/utests/ut_main.cpp @@ -2,7 +2,12 @@ int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - ::testing::FLAGS_gtest_death_test_style = "fast"; + try { + ::testing::InitGoogleTest(&argc, argv); + ::testing::FLAGS_gtest_death_test_style = "fast"; + } catch ( ... ) { + exit(EXIT_FAILURE); + } + return RUN_ALL_TESTS(); } diff --git a/utests/ut_tbm_surface_queue.cpp b/utests/ut_tbm_surface_queue.cpp index e64acfb..8673684 100644 --- a/utests/ut_tbm_surface_queue.cpp +++ b/utests/ut_tbm_surface_queue.cpp @@ -696,7 +696,7 @@ TEST_F(UtSurfaceQueue, ResetSequenceSuccess) /* create a sequence queue instead of a default one*/ tbm_surface_queue_destroy(queue); queue = tbm_surface_queue_sequence_create(QUEUE_SIZE, width, height, format, TBM_BO_DEFAULT); - ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result); + ASSERT_TRUE(queue != NULL); result = tbm_surface_queue_dequeue(queue, &surface); ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result); @@ -1261,7 +1261,7 @@ TEST_F(UtSurfaceQueue, AddCanDequeueCbSuccess) ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result); cb_data = 0; - tbm_surface_queue_can_dequeue(queue, 0); + ASSERT_TRUE(tbm_surface_queue_can_dequeue(queue, 0)); ASSERT_TRUE(cb_data == 1); } @@ -1290,7 +1290,7 @@ TEST_F(UtSurfaceQueue, RemoveCanDequeueCbSuccess) ASSERT_EQ(TBM_SURFACE_QUEUE_ERROR_NONE, result); cb_data = 0; - tbm_surface_queue_can_dequeue(queue, 0); + ASSERT_TRUE(tbm_surface_queue_can_dequeue(queue, 0)); ASSERT_TRUE(cb_data == 0); } -- 2.7.4