Skip to content

GitLab

T
tangled
Commit 682897db authored by kylechar's avatar kylechar Committed by Commit Bot
Browse files
Options

Revert "Add viz_screenshot_sync_tests." 

This reverts commit 6f5d66e1.

Reason for revert: Test is failing on Windows 7 GPU bots.

Original change's description:
> Add viz_screenshot_sync_tests.
> 
> Add a new GPU test target that runs screenshot_sync a second time with
> --enable-features=VizDisplayCompositor. This test will verify that GPU
> compositing is working for OOP-D. The test only runs on Windows and
> Linux bots.
> 
> Bug: 812385
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
> Change-Id: I56de0d01922d1c08521f3fd5aed4f64c148374e3
> Reviewed-on: https://chromium-review.googlesource.com/1028613
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: kylechar <kylechar@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#554529}

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

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 812385
Change-Id: Icf9c2d398312bebfd7ca5b7d47e2b0876716dd70
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/1034392Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554682}
parent d4f281b5
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 494 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 682897db
...@@ -2384,30 +2384,6 @@ TELEMETRY_GPU_INTEGRATION_TESTS = { ...@@ -2384,30 +2384,6 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
'shards': 20, 'shards': 20,
}, },
}, },
'viz_screenshot_sync': {
'target_name': 'screenshot_sync',
'args': [
'--dont-restore-color-profile-after-test',
],
'extra_browser_args': [
# This test confirms that GPU compositing is working with OOP-D.
'--enable-features=VizDisplayCompositor',
],
'tester_configs': [
{
'predicate': Predicates.DEFAULT,
'disabled_instrumentation_types': ['tsan'],
'os_types': ['win', 'linux'],
},
],
'disabled_tester_configs': [
{
'names': [
'Linux FYI Ozone (Intel)',
],
},
],
},
} }
# These isolated tests don't use telemetry. They need to be placed in the # These isolated tests don't use telemetry. They need to be placed in the
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 682897db
...@@ -4069,32 +4069,6 @@ ...@@ -4069,32 +4069,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-384.90",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -4708,33 +4682,6 @@ ...@@ -4708,33 +4682,6 @@
"expiration": 10800 "expiration": 10800
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
],
"expiration": 10800
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -5219,32 +5166,6 @@ ...@@ -5219,32 +5166,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -5744,32 +5665,6 @@ ...@@ -5744,32 +5665,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-384.90",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -13259,32 +13154,6 @@ ...@@ -13259,32 +13154,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -13995,32 +13864,6 @@ ...@@ -13995,32 +13864,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -15072,41 +14915,6 @@ ...@@ -15072,41 +14915,6 @@
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -16163,32 +15971,6 @@ ...@@ -16163,32 +15971,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -16819,32 +16601,6 @@ ...@@ -16819,32 +16601,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8792",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -17522,32 +17278,6 @@ ...@@ -17522,32 +17278,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -18452,41 +18182,6 @@ ...@@ -18452,41 +18182,6 @@
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8792",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8792\", \"os\": \"Windows-2008ServerR2-SP1\", \"pool\": \"Chrome-GPU\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -19270,32 +18965,6 @@ ...@@ -19270,32 +18965,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug_x64",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8792",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -19973,32 +19642,6 @@ ...@@ -19973,32 +19642,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release_x64",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8792",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
......
testing/buildbot/chromium.gpu.json
View file @ 682897db
...@@ -634,32 +634,6 @@ ...@@ -634,32 +634,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-384.90",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -1021,32 +995,6 @@ ...@@ -1021,32 +995,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-384.90",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -2836,32 +2784,6 @@ ...@@ -2836,32 +2784,6 @@
] ]
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=debug",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
...@@ -3426,41 +3348,6 @@ ...@@ -3426,41 +3348,6 @@
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py" "script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
} }
}, },
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "viz_screenshot_sync_tests",
"override_compile_targets": [
"telemetry_gpu_integration_test"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"10de:1cb3-23.21.13.8816\", \"os\": \"Windows-10\", \"pool\": \"Chrome-GPU\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
......
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