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

Commit 34fb8d96 authored by Dan Shi's avatar Dan Shi Committed by Gerrit Code Review
Browse files

Merge "Support waiting for surfaceflinger service to stop before test starts"... 

Merge "Support waiting for surfaceflinger service to stop before test starts" into android11-tests-dev
parents b2bee2be 4492ac79

graphics/composer/2.1/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_test { 


    // TODO(b/64437680): Assume these libs are always available on the device.

    shared_libs: [

        "libbase",

        "libfmq",

        "libsync",

        "android.hardware.graphics.mapper@2.0",

graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define LOG_TAG "graphics_composer_hidl_hal_test"



#include <android-base/logging.h>

#include <android-base/properties.h>

#include <composer-vts/2.1/ComposerVts.h>

#include <composer-vts/2.1/GraphicsComposerCallback.h>

#include <composer-vts/2.1/TestCommandReader.h>
@@ -1100,3 +1101,15 @@ INSTANTIATE_TEST_SUITE_P( 
}  // namespace graphics

}  // namespace hardware

}  // namespace android



int main(int argc, char** argv) {

    ::testing::InitGoogleTest(&argc, argv);



    using namespace std::chrono_literals;

    if (!android::base::WaitForProperty("init.svc.surfaceflinger", "stopped", 10s)) {

        ALOGE("Failed to stop init.svc.surfaceflinger");

        return -1;

    }



    return RUN_ALL_TESTS();

}

graphics/composer/2.2/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_test { 
        "libEGL",

        "libGLESv1_CM",

        "libGLESv2",

        "libbase",

        "libfmq",

        "libgui",

        "libhidlbase",

graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define LOG_TAG "graphics_composer_hidl_hal_test@2.2"



#include <android-base/logging.h>

#include <android-base/properties.h>

#include <android/hardware/graphics/mapper/2.0/IMapper.h>

#include <composer-vts/2.1/GraphicsComposerCallback.h>

#include <composer-vts/2.1/TestCommandReader.h>
@@ -698,3 +699,15 @@ INSTANTIATE_TEST_SUITE_P( 
}  // namespace graphics

}  // namespace hardware

}  // namespace android



int main(int argc, char** argv) {

    ::testing::InitGoogleTest(&argc, argv);



    using namespace std::chrono_literals;

    if (!android::base::WaitForProperty("init.svc.surfaceflinger", "stopped", 10s)) {

        ALOGE("Failed to stop init.svc.surfaceflinger");

        return -1;

    }



    return RUN_ALL_TESTS();

}
 
 No newline at end of file

graphics/composer/2.3/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_test { 


    // TODO(b/64437680): Assume these libs are always available on the device.

    shared_libs: [

        "libbase",

        "libfmq",

        "libhidlbase",

        "libsync",