Skip to content

GitLab

T
tangled
Commit 8c1f8bc8 authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot
Browse files
Options

Revert "Mac gl_unittests: enable GLImageBindTest BGRX_1010102" 

This reverts commit 62633a07.

Reason for revert: 
Broke 
 chromium.gpu.fyi
  Mac Experimental Retina Release (NVIDIA) 

https://ci.chromium.org/buildbot/chromium.gpu.fyi/Mac%20Experimental%20Retina%20Release%20%28NVIDIA%29/3232

Original change's description:
> Mac gl_unittests: enable GLImageBindTest BGRX_1010102
> 
> This CL adds gl_unittests to chromium.gpu.fyi, hence making it
> run, among others, on the Mac nVidia bot that caused the original
> CL to be reverted.
> 
> There's more information on the bug but, in a nutshell, the
> original CL was reverted due to a specific nVidia bug that
> manifested itself on the chromium.gpu.fyi mac bot; however,
> it doesn't show up in the mac_optional_gpu_rel. So, this CL
> has no specific nVidia provisions, just reenables the test,
> and we'll see what happens in the chromium.gpu.fyi waterfall :-)
> 
> 
> Bug: 803473
> Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
> Change-Id: I71c0451d2e3b53baa3bd24bafdf1f7a5f1210363
> Reviewed-on: https://chromium-review.googlesource.com/886543
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Miguel Casas <mcasas@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532136}

TBR=kbr@chromium.org,mcasas@chromium.org

Change-Id: I5988cab9dcb3fe2da1f22750ec76c1ffb0cf4555
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 803473
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/889771Reviewed-by: default avatarMiguel Casas <mcasas@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532257}
parent 57254514
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 101 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 8c1f8bc8
......@@ -1480,11 +1480,6 @@ COMMON_GTESTS = {
]
},
'gl_unittests': {
'tester_configs': [
{
'predicate': Predicates.DEFAULT_AND_OPTIONAL,
},
],
'disabled_tester_configs': [
{
'names': [
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 8c1f8bc8
......@@ -10119,24 +10119,6 @@
"test": "angle_end2end_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests",
"--no-xvfb"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-384.90",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_unittests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
......@@ -10292,22 +10274,6 @@
"test": "angle_end2end_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "gl_unittests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
......@@ -10447,24 +10413,6 @@
"test": "angle_end2end_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.12.6",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_unittests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
......@@ -10616,24 +10564,6 @@
"test": "angle_end2end_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:0fe9",
"hidpi": "1",
"os": "Mac-10.12.6",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_unittests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
......@@ -10786,30 +10716,6 @@
},
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8792",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_unittests",
"trigger_script": {
"args": [
"--gpu-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]"
],
"script": "//content/test/gpu/trigger_gpu_test.py"
},
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests",
......
ui/gl/gl_image_io_surface_unittest.cc
View file @ 8c1f8bc8
......@@ -109,11 +109,11 @@ INSTANTIATE_TYPED_TEST_CASE_P(GLImageIOSurface,
GLImageRGBTestTypes);
using GLImageBindTestTypes = testing::Types<
// TODO(mcasas): enable BGRX_1010102, https://crbug.com/803473.
GLImageIOSurfaceTestDelegate<gfx::BufferFormat::BGRA_8888>,
GLImageIOSurfaceTestDelegate<gfx::BufferFormat::RGBA_8888>,
GLImageIOSurfaceTestDelegate<gfx::BufferFormat::BGRX_8888>,
GLImageIOSurfaceTestDelegate<gfx::BufferFormat::RGBA_F16>,
GLImageIOSurfaceTestDelegate<gfx::BufferFormat::BGRX_1010102>>;
GLImageIOSurfaceTestDelegate<gfx::BufferFormat::RGBA_F16>>;
INSTANTIATE_TYPED_TEST_CASE_P(GLImageIOSurface,
GLImageBindTest,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment