Skip to content

GitLab

T
tangled
Commit 1f9ee1ad authored by Megan Jablonski's avatar Megan Jablonski Committed by Commit Bot
Browse files
Options

Revert "Add VR browser tests to win7_chromium_rel_ng" 

This reverts commit acbcd628.

Reason for revert: Tests failing on Builder: Win10 Debug (NVIDIA)
https://uberchromegw.corp.google.com/i/chromium.gpu/builders/Win10%20Debug%20%28NVIDIA%29

Original change's description:
> Add VR browser tests to win7_chromium_rel_ng
> 
> Adds the VR browser tests to win7_chromium_rel_ng now that there
> is enough capacity to run them on changes that affect VR.
> 
> Bug: 780668
> 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: I3646b04c47b5f6c683ebf59ce2046c881127bd97
> Reviewed-on: https://chromium-review.googlesource.com/907532
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#535826}

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

Change-Id: I55aff7e3b99d1bebe57c9d462bb30ff2fa1d0a1d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 780668
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/911947Reviewed-by: default avatarMegan Jablonski <megjablon@chromium.org>
Commit-Queue: Megan Jablonski <megjablon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535899}
parent f7aaf359
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 162 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 1f9ee1ad
...@@ -1753,20 +1753,30 @@ COMMON_GTESTS = { ...@@ -1753,20 +1753,30 @@ COMMON_GTESTS = {
'vr_browser_tests': { 'vr_browser_tests': {
'tester_configs': [ 'tester_configs': [
{ {
'predicate': Predicates.DEFAULT_AND_OPTIONAL, 'predicate': Predicates.FYI_ONLY,
'os_types': ['win'], 'os_types': ['win']
'swarming_dimension_sets': [
{
'gpu': NVIDIA_QUADRO_P400_ALL_DRIVERS,
'os': WIN10_NVIDIA_QUADRO_P400_STABLE_OS,
},
{
'gpu': INTEL_HD_630,
'os': 'Windows-10',
}
],
}, },
], ],
# We currently only want to run this on Win10 Release (NVIDIA)
'disabled_tester_configs': [
{
'names': [
'Win7 Release (NVIDIA)',
'Win7 Debug (NVIDIA)',
'Win10 dEQP Release (NVIDIA)',
'Win10 Experimental Release (NVIDIA)',
'Win10 Debug (NVIDIA)',
'Win7 Release (AMD)',
'Win7 Debug (AMD)',
'Win7 dEQP Release (AMD)',
'Win10 Release (Intel HD 630)',
'Win10 Release (NVIDIA Quadro P400)',
'Win7 x64 Release (NVIDIA)',
'Win7 x64 Debug (NVIDIA)',
'Win7 x64 dEQP Release (NVIDIA)',
],
}
],
'args': [ 'args': [
'--enable-gpu', '--enable-gpu',
'--test-launcher-bot-mode', '--test-launcher-bot-mode',
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 1f9ee1ad
...@@ -10860,28 +10860,6 @@ ...@@ -10860,28 +10860,6 @@
"test": "angle_white_box_tests", "test": "angle_white_box_tests",
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--gtest_filter=VrBrowserTest*",
"--gtest_also_run_disabled_tests"
],
"name": "vr_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "browser_tests",
"use_xvfb": false
},
{ {
"args": [ "args": [
"--use-gpu-in-tests", "--use-gpu-in-tests",
...@@ -11186,37 +11164,6 @@ ...@@ -11186,37 +11164,6 @@
}, },
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--gtest_filter=VrBrowserTest*",
"--gtest_also_run_disabled_tests"
],
"name": "vr_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "browser_tests",
"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"
},
"use_xvfb": false
},
{ {
"args": [ "args": [
"--use-gpu-in-tests", "--use-gpu-in-tests",
...@@ -11709,28 +11656,6 @@ ...@@ -11709,28 +11656,6 @@
"test": "angle_white_box_tests", "test": "angle_white_box_tests",
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--gtest_filter=VrBrowserTest*",
"--gtest_also_run_disabled_tests"
],
"name": "vr_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "browser_tests",
"use_xvfb": false
},
{ {
"args": [ "args": [
"--use-gpu-in-tests", "--use-gpu-in-tests",
...@@ -12421,28 +12346,6 @@ ...@@ -12421,28 +12346,6 @@
"test": "browser_tests", "test": "browser_tests",
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--gtest_filter=VrBrowserTest*",
"--gtest_also_run_disabled_tests"
],
"name": "vr_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "browser_tests",
"use_xvfb": false
},
{ {
"args": [ "args": [
"--use-gpu-in-tests", "--use-gpu-in-tests",
......
testing/buildbot/chromium.gpu.json
View file @ 1f9ee1ad
...@@ -2433,28 +2433,6 @@ ...@@ -2433,28 +2433,6 @@
"test": "angle_unittests", "test": "angle_unittests",
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--gtest_filter=VrBrowserTest*",
"--gtest_also_run_disabled_tests"
],
"name": "vr_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "browser_tests",
"use_xvfb": false
},
{ {
"args": [ "args": [
"--use-gpu-in-tests", "--use-gpu-in-tests",
...@@ -2870,37 +2848,6 @@ ...@@ -2870,37 +2848,6 @@
}, },
"use_xvfb": false "use_xvfb": false
}, },
{
"args": [
"--enable-gpu",
"--test-launcher-bot-mode",
"--test-launcher-jobs=1",
"--gtest_filter=VrBrowserTest*",
"--gtest_also_run_disabled_tests"
],
"name": "vr_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "browser_tests",
"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"
},
"use_xvfb": false
},
{ {
"args": [ "args": [
"--use-gpu-in-tests", "--use-gpu-in-tests",
......
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