diff options
| author | Derek Sollenberger <djsollen@google.com> | 2022-04-29 15:38:57 -0400 |
|---|---|---|
| committer | SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> | 2022-04-29 22:35:27 +0000 |
| commit | d71cfa577734c3e7ed164354fe17304d75ddc957 (patch) | |
| tree | b90edf9df7faf364d2951054c577b8f2c085321d | |
| parent | c69447d3cc192de5b600eb0e8228a4b101a5cbe4 (diff) | |
| download | skia-d71cfa577734c3e7ed164354fe17304d75ddc957.tar.gz | |
Fix bug where SkQP test that are always to be excluded are not.
Also exclude some additional test cases based on data collected
from Skia's infrastructure for known problematic GPU test cases.
Bug: b/230879386
Bug: b/227806494
Change-Id: Id0bf73828fa04b3139f1e9cb94511db9d62d8d86
(cherry picked from commit 6a810fe45b738ff834dfb57cd8ce3836bf8c1ef8)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535579
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt | 18 | ||||
| -rw-r--r-- | tools/skqp/src/skqp.cpp | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt index f73893b763..dfbe740c3e 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt @@ -84,7 +84,19 @@ GrSurfaceRenderability, 33 # Test that fail on some existing in-market devices b/229804433 ES2BlendWithNoTexture, 33 -GLBackendAllocationTest, 33 -GrSurfaceRenderability, 33 SkRuntimeEffect_Blender_GPU, 33 -SkSLStructsInFunctions_GPU, 33
\ No newline at end of file +SkSLStructsInFunctions_GPU, 33 + +# Tests known to fail in Skia's infra on existing Android devices +# see skia.googlesource.com/skia/+/refs/heads/chrome/m100/infra/bots/gen_tasks_logic/dm_flags.go +ProcessorCloneTest, 33 +Programs, 33 +SkSLCommaSideEffects_GPU, 33 +SkSLInoutParameters_GPU, 33 +SkSLIntrinsicClampFloat_GPU, 33 +SkSLIntrinsicMixFloat_GPU, 33 +SkSLMatrixToVectorCast_GPU, 33 +SkSLOutParams_GPU, 33 +SkSLOutParamsAreDistinctFromGlobal_GPU, 33 +SkSLOutParamsTricky_GPU, 33 +SkSLUnaryPositiveNegative_GPU, 33 diff --git a/tools/skqp/src/skqp.cpp b/tools/skqp/src/skqp.cpp index 10633802b3..4a11886226 100644 --- a/tools/skqp/src/skqp.cpp +++ b/tools/skqp/src/skqp.cpp @@ -175,7 +175,7 @@ void ExclusionList::initialize(SkQPAssetManager* assetManager, } std::string_view testName = line; - int excludeUntilAndroidAPILevel = fEnforcedAndroidAPILevel; + int excludeUntilAndroidAPILevel = fEnforcedAndroidAPILevel + 1; // Check to see if the test has a min Android API level defined auto commaLocation = line.find_first_of(','); |