Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33770931 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Don't skip tests on error 

Skipping on failures hides the issue.

Bug: 328119950
Test: atest LayerCallbackTest
Flag: EXEMPT tests
Change-Id: Ie217800bbe62b83865c7152af50412db9bad7c31
parent 10fbabfb

services/surfaceflinger/tests/LayerCallback_test.cpp

+60 −60
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ TEST_F(LayerCallbackTest, BufferColor) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer, true, true);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -191,7 +191,7 @@ TEST_F(LayerCallbackTest, NoBufferNoColor) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer, false, false);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -214,7 +214,7 @@ TEST_F(LayerCallbackTest, BufferNoColor) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer, true, false);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -236,7 +236,7 @@ TEST_F(LayerCallbackTest, NoBufferColor) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer, false, true);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -256,7 +256,7 @@ TEST_F(LayerCallbackTest, NoStateChange) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -274,7 +274,7 @@ TEST_F(LayerCallbackTest, OffScreen) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -297,12 +297,12 @@ TEST_F(LayerCallbackTest, MergeBufferNoColor) { 
    CallbackHelper callback1, callback2;

    int err = fillTransaction(transaction1, &callback1, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -331,12 +331,12 @@ TEST_F(LayerCallbackTest, MergeNoBufferColor) { 
    CallbackHelper callback1, callback2;

    int err = fillTransaction(transaction1, &callback1, layer1, false, true);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer2, false, true);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -366,12 +366,12 @@ TEST_F(LayerCallbackTest, MergeOneBufferOneColor) { 
    CallbackHelper callback1, callback2;

    int err = fillTransaction(transaction1, &callback1, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer2, false, true);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -401,12 +401,12 @@ TEST_F(LayerCallbackTest, Merge_SameCallback) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction1, &callback, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -426,12 +426,12 @@ TEST_F(LayerCallbackTest, Merge_SameLayer) { 
    CallbackHelper callback1, callback2;

    int err = fillTransaction(transaction1, &callback1, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -460,12 +460,12 @@ TEST_F(LayerCallbackTest, Merge_DifferentClients) { 
    CallbackHelper callback1, callback2;

    int err = fillTransaction(transaction1, &callback1, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -494,7 +494,7 @@ TEST_F(LayerCallbackTest, MultipleTransactions) { 
    for (size_t i = 0; i < 10; i++) {

        int err = fillTransaction(transaction, &callback, layer);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -522,14 +522,14 @@ TEST_F(LayerCallbackTest, MultipleTransactions_NoStateChange) { 
        if (i == 0) {

            int err = fillTransaction(transaction, &callback, layer);

            if (err) {

                GTEST_SUCCEED() << "test not supported";

                GTEST_FAIL() << "Error:" << err;

                return;

            }

            expected.addSurface(ExpectedResult::Transaction::PRESENTED, layer);

        } else {

            int err = fillTransaction(transaction, &callback);

            if (err) {

                GTEST_SUCCEED() << "test not supported";

                GTEST_FAIL() << "Error:" << err;

                return;

            }

        }
@@ -551,13 +551,13 @@ TEST_F(LayerCallbackTest, MultipleTransactions_SameStateChange) { 
        if (i == 0) {

            int err = fillTransaction(transaction, &callback, layer);

            if (err) {

                GTEST_SUCCEED() << "test not supported";

                GTEST_FAIL() << "Error:" << err;

                return;

            }

        } else {

            int err = fillTransaction(transaction, &callback);

            if (err) {

                GTEST_SUCCEED() << "test not supported";

                GTEST_FAIL() << "Error:" << err;

                return;

            }

        }
@@ -589,12 +589,12 @@ TEST_F(LayerCallbackTest, MultipleTransactions_Merge) { 
    for (size_t i = 0; i < 10; i++) {

        int err = fillTransaction(transaction1, &callback1, layer1);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }

        err = fillTransaction(transaction2, &callback2, layer2);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -638,12 +638,12 @@ TEST_F(LayerCallbackTest, MultipleTransactions_Merge_DifferentClients) { 
    for (size_t i = 0; i < 10; i++) {

        int err = fillTransaction(transaction1, &callback1, layer1);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }

        err = fillTransaction(transaction2, &callback2, layer2);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -688,12 +688,12 @@ TEST_F(LayerCallbackTest, MultipleTransactions_Merge_DifferentClients_NoStateCha 
    // Normal call to set up test

    int err = fillTransaction(transaction1, &callback1, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -716,12 +716,12 @@ TEST_F(LayerCallbackTest, MultipleTransactions_Merge_DifferentClients_NoStateCha 
    // Test

    err = fillTransaction(transaction1, &callback1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -750,12 +750,12 @@ TEST_F(LayerCallbackTest, MultipleTransactions_Merge_DifferentClients_SameStateC 
    // Normal call to set up test

    int err = fillTransaction(transaction1, &callback1, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -778,12 +778,12 @@ TEST_F(LayerCallbackTest, MultipleTransactions_Merge_DifferentClients_SameStateC 
    // Test

    err = fillTransaction(transaction1, &callback1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -814,7 +814,7 @@ TEST_F(LayerCallbackTest, DISABLED_MultipleTransactions_SingleFrame) { 


        int err = fillTransaction(transaction, &callback, layer);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -832,7 +832,7 @@ TEST_F(LayerCallbackTest, MultipleTransactions_SingleFrame_NoStateChange) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -849,7 +849,7 @@ TEST_F(LayerCallbackTest, MultipleTransactions_SingleFrame_NoStateChange) { 


        err = fillTransaction(transaction, &callback);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -867,7 +867,7 @@ TEST_F(LayerCallbackTest, MultipleTransactions_SingleFrame_SameStateChange) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -889,7 +889,7 @@ TEST_F(LayerCallbackTest, MultipleTransactions_SingleFrame_SameStateChange) { 


        err = fillTransaction(transaction, &callback);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -909,7 +909,7 @@ TEST_F(LayerCallbackTest, DesiredPresentTime) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -933,7 +933,7 @@ TEST_F(LayerCallbackTest, DesiredPresentTime_Multiple) { 
    CallbackHelper callback1;

    int err = fillTransaction(transaction, &callback1, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -950,7 +950,7 @@ TEST_F(LayerCallbackTest, DesiredPresentTime_Multiple) { 
    CallbackHelper callback2;

    err = fillTransaction(transaction, &callback2, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -979,7 +979,7 @@ TEST_F(LayerCallbackTest, DISABLED_DesiredPresentTime_OutOfOrder) { 
    CallbackHelper callback1;

    int err = fillTransaction(transaction, &callback1, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -996,7 +996,7 @@ TEST_F(LayerCallbackTest, DISABLED_DesiredPresentTime_OutOfOrder) { 
    CallbackHelper callback2;

    err = fillTransaction(transaction, &callback2, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -1023,7 +1023,7 @@ TEST_F(LayerCallbackTest, DesiredPresentTime_Past) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -1047,7 +1047,7 @@ TEST_F(LayerCallbackTest, ExpectedPresentTime) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -1075,7 +1075,7 @@ TEST_F(LayerCallbackTest, EmptyBufferStateChanges) { 
    for (size_t i = 0; i < 10; i++) {

        int err = fillTransaction(transaction, &callback, bufferLayer);

        if (err) {

            GTEST_SUCCEED() << "test not supported";

            GTEST_FAIL() << "Error:" << err;

            return;

        }
@@ -1110,7 +1110,7 @@ TEST_F(LayerCallbackTest, DISABLED_NonBufferLayerStateChanges) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    transaction.setPosition(layer, 1, 2);
@@ -1132,7 +1132,7 @@ TEST_F(LayerCallbackTest, CommitCallbackOffscreenLayer) { 
    int err = fillTransaction(transaction, &callback, layer, true);

    err |= fillBuffer(transaction, offscreenLayer);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -1159,7 +1159,7 @@ TEST_F(LayerCallbackTest, TransactionCommittedCallback_BSL) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback, layer, true);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    transaction.addTransactionCommittedCallback(callback.function, callback.getContext()).apply();
@@ -1179,7 +1179,7 @@ TEST_F(LayerCallbackTest, TransactionCommittedCallback_EffectLayer) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    transaction.addTransactionCommittedCallback(callback.function, callback.getContext()).apply();
@@ -1199,7 +1199,7 @@ TEST_F(LayerCallbackTest, TransactionCommittedCallback_ContainerLayer) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    transaction.addTransactionCommittedCallback(callback.function, callback.getContext()).apply();
@@ -1215,7 +1215,7 @@ TEST_F(LayerCallbackTest, TransactionCommittedCallback_NoLayer) { 
    CallbackHelper callback;

    int err = fillTransaction(transaction, &callback);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    transaction.addTransactionCommittedCallback(callback.function, callback.getContext()).apply();
@@ -1235,7 +1235,7 @@ TEST_F(LayerCallbackTest, SetNullBuffer) { 
    int err = fillTransaction(transaction, &callback, layer, /*setBuffer=*/true,

                              /*setBackgroundColor=*/false);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    transaction.apply();
@@ -1263,7 +1263,7 @@ TEST_F(LayerCallbackTest, SetNullBuffer) { 
    err = fillTransaction(transaction, &callback, layer, /*setBuffer=*/true,

                          /*setBackgroundColor=*/false);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -1310,12 +1310,12 @@ TEST_F(LayerCallbackTest, OccludedLayerHasReleaseCallback) { 
    CallbackHelper callback1a, callback1b, callback2a, callback2b;

    int err = fillTransaction(transaction1, &callback1a, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2a, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }
@@ -1344,12 +1344,12 @@ TEST_F(LayerCallbackTest, OccludedLayerHasReleaseCallback) { 
    // Submit new buffers so previous buffers can be released

    err = fillTransaction(transaction1, &callback1b, layer1);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

    err = fillTransaction(transaction2, &callback2b, layer2);

    if (err) {

        GTEST_SUCCEED() << "test not supported";

        GTEST_FAIL() << "Error:" << err;

        return;

    }

services/surfaceflinger/tests/LayerRenderTypeTransaction_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1333,8 +1333,8 @@ TEST_P(LayerRenderTypeTransactionTest, DISABLED_SetFenceBasic_BufferState) { 
    TransactionUtils::fillGraphicBufferColor(buffer, Rect(0, 0, 32, 32), Color::RED);



    sp<Fence> fence;

    if (getBuffer(nullptr, &fence) != NO_ERROR) {

        GTEST_SUCCEED() << "test not supported";

    if (status_t err = getBuffer(nullptr, &fence) != NO_ERROR) {

        GTEST_FAIL() << "Error:" << err;

        return;

    }