fix some tc fail errors
authorJunkyeong Kim <jk0430.kim@samsung.com>
Sat, 20 Feb 2021 08:40:54 +0000 (17:40 +0900)
committerJunkyeong Kim <jk0430.kim@samsung.com>
Sat, 20 Feb 2021 08:40:57 +0000 (17:40 +0900)
Change-Id: I27ffbd62daaa1359d568f5d95aa7d97b9af5b0d4
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>
haltests/src/tc_tdm_backend_capture.cpp
haltests/src/tc_tdm_backend_pp.cpp
haltests/src/tc_tdm_hwc.cpp

index 4b9f941..0e23486 100644 (file)
@@ -143,7 +143,8 @@ void TDMBackendCapture::TearDown(void)
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
-               EXPECT_EQ(tc_tdm_output_unset(dpy, outputs[o]), true);
+               if (has_capture_cap)
+                       EXPECT_EQ(tc_tdm_output_unset(dpy, outputs[o]), true);
        }
 
        DestroyBuffers();
index c03e3b0..2a780a3 100644 (file)
@@ -141,7 +141,8 @@ void TDMBackendPP::TearDown(void)
                tdm_pp_destroy(pp);
 
        DestroyBuffers();
-       EXPECT_EQ(tc_tdm_output_unset(dpy, output), true);
+       if (output)
+               EXPECT_EQ(tc_tdm_output_unset(dpy, output), true);
 
        TDMBackendDisplay::TearDown();
 }
index 869c9c2..5a7f960 100644 (file)
@@ -334,6 +334,8 @@ TEST_P(TDMHwc, GetClientTargetBufferQueueSuccessful)
        tbm_surface_queue_h queue = NULL;
 
        for (int o = 0; o < output_count; o++) {
+               if (tc_tdm_output_is_connected(outputs[o]) == false)
+                       continue;
                EXPECT_EQ(tc_tdm_output_prepare(dpy, outputs[o], true), true);
                hwc = tdm_output_get_hwc(outputs[o], &error);
                if (hwc) {
@@ -386,6 +388,8 @@ TEST_P(TDMHwc, SetClientTargetBufferSuccessfulSetBuff)
        tbm_surface_h target_buff = NULL;
 
        for (int o = 0; o < output_count; o++) {
+               if (tc_tdm_output_is_connected(outputs[o]) == false)
+                       continue;
                EXPECT_EQ(tc_tdm_output_prepare(dpy, outputs[o], true), true);
                hwc = tdm_output_get_hwc(outputs[o], &error);
                if (hwc) {
@@ -414,6 +418,8 @@ TEST_P(TDMHwc, SetClientTargetBufferSuccessfulResetBuff)
        tdm_region damage = {.num_rects = 0, .rects = NULL};
 
        for (int o = 0; o < output_count; o++) {
+               if (tc_tdm_output_is_connected(outputs[o]) == false)
+                       continue;
                EXPECT_EQ(tc_tdm_output_prepare(dpy, outputs[o], true), true);
                hwc = tdm_output_get_hwc(outputs[o], &error);
                if (hwc) {
@@ -513,6 +519,8 @@ TEST_P(TDMHwc, AcceptChangesSuccessful)
        uint32_t get_num = 0;
 
        for (int o = 0; o < output_count; o++) {
+               if (tc_tdm_output_is_connected(outputs[o]) == false)
+                       continue;
                EXPECT_EQ(tc_tdm_output_prepare(dpy, outputs[o], true), true);
                hwc = tdm_output_get_hwc(outputs[o], &error);
                if (hwc) {
@@ -572,6 +580,8 @@ TEST_P(TDMHwc, CommitSuccessful)
        uint32_t get_num = 0;
 
        for (int o = 0; o < output_count; o++) {
+               if (tc_tdm_output_is_connected(outputs[o]) == false)
+                       continue;
                EXPECT_EQ(tc_tdm_output_prepare(dpy, outputs[o], true), true);
                hwc = tdm_output_get_hwc(outputs[o], &error);
                if (hwc) {