utests: check return value

Change-Id: I21868201523ec15af93d13bfc85fe17a8e770bf7

diff --git a/utests/src/ut_tdm_client.cpp b/utests/src/ut_tdm_client.cpp
index e4b445b..b44ef46 100644 (file)
--- a/utests/src/ut_tdm_client.cpp
+++ b/utests/src/ut_tdm_client.cpp
@@ -104,9 +104,16 @@ void TDMClient::ServerKill(void)
                close(pipe_child[0]);
        if (pipe_child[1] >= 0) {
                if (server_pid > 0) {
-                       _ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_TERMINATE_SERVER);
-                       waitpid(server_pid, NULL, 0);
-                       TDM_INFO("*** server terminated ***");
+                       bool ret = _ut_tdm_pipe_write_msg(pipe_child[1], pipe_parent[0], TDM_UT_PIPE_MSG_TERMINATE_SERVER);
+                       if (ret) {
+                               if (waitpid(server_pid, NULL, 0) == server_pid)
+                                       TDM_INFO("*** server terminated ***");
+                               else
+                                       TDM_ERR("*** failed to terminate server ***");
+                       } else {
+                               if (kill(server_pid, 9) < 0)
+                                       TDM_ERR("*** failed to kill server ***");
+                       }
                }
                close(pipe_child[1]);
        }

diff --git a/utests/src/ut_tdm_helper.cpp b/utests/src/ut_tdm_helper.cpp
index 9684f64..b9ad342 100644 (file)
--- a/utests/src/ut_tdm_helper.cpp
+++ b/utests/src/ut_tdm_helper.cpp
@@ -486,28 +486,17 @@ TEST_P(TDMHelper, HelperGetDisplayInformationNullOther)
 
 TEST_P(TDMHelper, HelperCommitPerVblankEnabled)
 {
-       tdm_helper_commit_per_vblank_enabled(dpy);
+       ASSERT_EQ(tdm_helper_commit_per_vblank_enabled(dpy), 0);
 }
 
 TEST_P(TDMHelper, HelperCommitPerVblankEnabledNullOBject)
 {
-       tdm_helper_commit_per_vblank_enabled(NULL);
-}
-
-TEST_P(TDMHelper, HelperOutputCommitPerVblankEnabled)
-{
-       for (int o = 0; o < output_count; o++) {
-               tdm_error ret;
-               tdm_output *output = tdm_display_get_output(dpy, o, &ret);
-               ASSERT_EQ(ret, TDM_ERROR_NONE);
-               ASSERT_NE(output, NULL);
-               tdm_helper_output_commit_per_vblank_enabled(output);
-       }
+       ASSERT_EQ(tdm_helper_commit_per_vblank_enabled(NULL), 0);
 }
 
 TEST_P(TDMHelper, HelperOutputCommitPerVblankEnabledNullObject)
 {
-       tdm_helper_output_commit_per_vblank_enabled(NULL);
+       ASSERT_EQ(tdm_helper_output_commit_per_vblank_enabled(NULL), -1);
 }
 
 #ifdef TDM_UT_TEST_WITH_PARAMS