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

Commit f890bb01 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: compile libsurfaceflingerflags_test as test" into main

parents 7f1ee998 f1d517de

services/surfaceflinger/tests/unittests/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ filegroup { 
cc_aconfig_library {

    name: "libsurfaceflingerflags_test",

    aconfig_declarations: "surfaceflinger_flags",

    // TODO(b/304338314): uncomment the below line once the bug is fixed

    // test: true,

    test: true,

}



cc_test {

services/surfaceflinger/tests/unittests/VSyncDispatchTimerQueueTest.cpp

+2 −6
Original line number Diff line number Diff line
@@ -1065,10 +1065,8 @@ TEST_F(VSyncDispatchTimerQueueTest, updatesVsyncTimeForCloseWakeupTime) { 
    EXPECT_THAT(cb.mReadyTime[0], Eq(2000));

}



// TODO(b/304338314): Set the flag value instead of skipping the test

TEST_F(VSyncDispatchTimerQueueTest, skipAVsyc) {

    // SET_FLAG_FOR_TEST(flags::dont_skip_on_early, false);

    if (flags::dont_skip_on_early()) GTEST_SKIP();

    SET_FLAG_FOR_TEST(flags::dont_skip_on_early, false);



    EXPECT_CALL(mMockClock, alarmAt(_, 500));

    CountingCallback cb(mDispatch);
@@ -1088,10 +1086,8 @@ TEST_F(VSyncDispatchTimerQueueTest, skipAVsyc) { 
    ASSERT_THAT(cb.mCalls.size(), Eq(1));

}



// TODO(b/304338314): Set the flag value instead of skipping the test

TEST_F(VSyncDispatchTimerQueueTest, dontskipAVsyc) {

    // SET_FLAG_FOR_TEST(flags::dont_skip_on_early, true);

    if (!flags::dont_skip_on_early()) GTEST_SKIP();

    SET_FLAG_FOR_TEST(flags::dont_skip_on_early, true);



    EXPECT_CALL(mMockClock, alarmAt(_, 500));

    CountingCallback cb(mDispatch);