AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct CTS SkQP test enforcement criteria.

Browse Source 
Restrict enforcement of CTS unit tests to only be applied to devices
that have a vendor image whose API level is >= when the SkQP unit tests were introduced into CTS.

Bug: b/235849228
Bug: b/229804433
Change-Id: Ie69a12dc320a65e4cceb42095dfa26ac38324e0d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/559156
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
This commit is contained in:
Derek Sollenberger 2022-07-15 16:20:02 -04:00 committed by SkCQ
parent 2cf696124c
commit 8496285686
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/skqp/src/skqp.cpp
View File

@ -65,6 +65,15 @@ public:
void initialize(SkQPAssetManager* assetManager, sk_sp<SkData> dat, int enforcedAndroidAPILevel); void initialize(SkQPAssetManager* assetManager, sk_sp<SkData> dat, int enforcedAndroidAPILevel);
bool isExcluded(const std::string& name) const { bool isExcluded(const std::string& name) const {
#if defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_FOR_SKQP)
// Exclude all unit tests from enforcement if ALL the following conditions are true:
// 1) We are building the CTS variant of SkQP (guarded by the SK_BUILD_FOR_SKQP define).
// 2) The enforced Android API level is older than when this test suite was introduced
// into CTS in Android T (API level 33).
if (fEnforcedAndroidAPILevel < 33) {
return true;
}
#endif
for (const auto& entry : fEntries) { for (const auto& entry : fEntries) {
if (std::regex_match(name, entry.regexPattern)) { if (std::regex_match(name, entry.regexPattern)) {
return fEnforcedAndroidAPILevel < entry.excludeUntilAndroidAPILevel; return fEnforcedAndroidAPILevel < entry.excludeUntilAndroidAPILevel;
@ -293,13 +302,29 @@ void SkQP::init(SkQPAssetManager* assetManager, const char* reportDirectory) {
SkGraphics::Init(); SkGraphics::Init();
gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr; gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
int minAndroidAPILevel = 0;
#ifdef SK_BUILD_FOR_ANDROID
char firstAPIVersionStr[PROP_VALUE_MAX];
int strLength = __system_property_get("ro.product.first_api_level", firstAPIVersionStr);
// Defaults to zero since most checks care if it is greater than a specific value. So this will // Defaults to zero since most checks care if it is greater than a specific value. So this will
// just default to it being less. // just default to it being less.
minAndroidAPILevel = (strLength == 0) ? 0 : atoi(firstAPIVersionStr); int minAndroidAPILevel = 0;
#ifdef SK_BUILD_FOR_ANDROID
// check for the minAPI level based on the order defined in
// docs.partner.android.com/gms/building/integrating/extending-os-upgrade-support-windows
// 1. board's current api level (for boards that have been upgraded by the SoC vendor)
// 2. board's first api level (for devices that initially shipped with an older version)
// 3. product's first api level
// 4. product's current api level
const auto propertyIds = { "ro.board.api_level",
"ro.board.first_api_level",
"ro.product.first_api_level",
"ro.build.version.sdk" };
char minAPIVersionStr[PROP_VALUE_MAX];
for (const char* property : propertyIds) {
int strLength = __system_property_get(property, minAPIVersionStr);
if (strLength != 0) {
minAndroidAPILevel = atoi(minAPIVersionStr);
break;
}
}
#endif #endif
// Load the exclusion list `skqp/unittests.txt`, if it exists. // Load the exclusion list `skqp/unittests.txt`, if it exists.