Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Support waiting for surfaceflinger service to stop before test starts" am: 1d8b9fc0b7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1486339

Change-Id: Id416ca6960f6acddd34a3e4e2bfe2da8b19544b5
This commit is contained in:
Treehugger Robot
2020-12-02 08:20:42 +00:00
committed by Automerger Merge Worker
parent 5aac849a64 1d8b9fc0b7
commit e814075692
8 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
graphics/composer/2.1/vts/functional/Android.bp
View File

@@ -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",

13
graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
View File

@@ -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();
}

1
graphics/composer/2.2/vts/functional/Android.bp
View File

@@ -27,6 +27,7 @@ cc_test {
"libEGL",
"libGLESv1_CM",
"libGLESv2",
"libbase",
"libfmq",
"libgui",
"libhidlbase",

13
graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
View File

@@ -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();
}

1
graphics/composer/2.3/vts/functional/Android.bp
View File

@@ -21,6 +21,7 @@ cc_test {
// TODO(b/64437680): Assume these libs are always available on the device.
shared_libs: [
"libbase",
"libfmq",
"libhidlbase",
"libsync",

13
graphics/composer/2.3/vts/functional/VtsHalGraphicsComposerV2_3TargetTest.cpp
View File

@@ -19,6 +19,7 @@
#include <algorithm>
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android/hardware/graphics/mapper/2.0/IMapper.h>
#include <composer-command-buffer/2.3/ComposerCommandBuffer.h>
#include <composer-vts/2.1/GraphicsComposerCallback.h>
@@ -628,3 +629,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();
}

1
graphics/composer/2.4/vts/functional/Android.bp
View File

@@ -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",

13
graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp
View File

@@ -21,6 +21,7 @@
#include <thread>
#include <android-base/logging.h>
#include <android-base/properties.h>
#include <android/hardware/graphics/mapper/2.0/IMapper.h>
#include <composer-command-buffer/2.4/ComposerCommandBuffer.h>
#include <composer-vts/2.4/ComposerVts.h>
@@ -683,3 +684,15 @@ TEST_P(GraphicsComposerHidlCommandTest, getLayerGenericMetadataKeys) {
} // 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();
}