From: Roman Marchenko Date: Mon, 18 Dec 2017 11:23:44 +0000 (+0200) Subject: utest: fix protex issue X-Git-Tag: accepted/tizen/unified/20171219.072724~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F164315%2F2;p=platform%2Fcore%2Fuifw%2Flibtdm.git utest: fix protex issue Change-Id: I8c2e93345ba14375853ac7f001deb211df2744df --- diff --git a/utests/src/ut_main.cpp b/utests/src/ut_main.cpp index 8d0544a..6443f33 100644 --- a/utests/src/ut_main.cpp +++ b/utests/src/ut_main.cpp @@ -32,7 +32,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 ( ... ) { + std::cout << "error while trying to init google tests.\n"; + exit(EXIT_FAILURE); + } return RUN_ALL_TESTS(); } diff --git a/utests/src/ut_tdm_client.cpp b/utests/src/ut_tdm_client.cpp index 3c88875..ba4bb07 100644 --- a/utests/src/ut_tdm_client.cpp +++ b/utests/src/ut_tdm_client.cpp @@ -105,7 +105,7 @@ tdm_client_test_prepare dont_use_it; class TDMClientTest : public ::testing::Test { protected: - TDMClientTest() : error(TDM_ERROR_NONE), server_pid(0), cl_serv_lock_fd(-1), + TDMClientTest() : error(TDM_ERROR_NONE), server_pid(0), dsp(nullptr), output(nullptr), layer(nullptr), buffer(nullptr), is_server_stopped(false) { set_env_vars(); @@ -237,14 +237,25 @@ private: void send_request(int req) { - send(socks_pair.client_socket, &req, sizeof req, 0); + int count; + + count = send(socks_pair.client_socket, &req, sizeof req, 0); + + if (count != sizeof req) + std::cout << "error while trying to send request to socks_pair.client_socket.\n"; } void handle_client_request() { int req; + int count; - recv(socks_pair.server_socket, &req, sizeof req, 0); + count = recv(socks_pair.server_socket, &req, sizeof req, 0); + + if (count != sizeof req) { + std::cout << "error while trying to reserve data from socks_pair.server_socket.\n"; + return; + } switch(req) { @@ -472,6 +483,11 @@ void TDMClientTest::init_tdm(void) for (int i = 0; i < outputs_cnt; i++) { output = tdm_display_get_output(dsp, i, nullptr); + if (output == NULL) { + std::cout << "tdm_display_get_output faild, server's gonna be stopped.\n"; + deinit_tdm(); + exit(EXIT_FAILURE); + } tdm_output_get_output_type(output, &tdm_output_type); /* we're not interesting about other outputs */ diff --git a/utests/src/ut_tdm_hwc_window.cpp b/utests/src/ut_tdm_hwc_window.cpp index 2b62c0e..13b7cc2 100644 --- a/utests/src/ut_tdm_hwc_window.cpp +++ b/utests/src/ut_tdm_hwc_window.cpp @@ -330,7 +330,7 @@ TEST_F(TDMOutputHwc, DISABLED_SetClientTargetBufferSuccessfulSetBuff) TEST_F(TDMOutputHwc, DISABLED_SetClientTargetBufferSuccessfulResetBuff) { - tdm_hwc_region damage; + tdm_hwc_region damage = {.num_rects = 0, .rects = NULL}; for (int i = 0; i < output_count; i++) { if (IsHwcEnable(i)) {