Skip to content

GitLab

T
tangled
Commit 2d4fb27b authored by bsheedy's avatar bsheedy Committed by Commit Bot
Browse files
Options

Reland "Add VR browser tests to win7_chromium_rel_ng" 

This was reverted due to the tests breaking on debug builds. This should
be fixed with crrev.com/c/914860.

Original description:

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: I79bab14433da47464b58115ff61c893a7cbe29fa
Reviewed-on: https://chromium-review.googlesource.com/916842
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#536778}
parent 2c288a34
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 37 deletions
content/test/gpu/generate_buildbot_json.py
View file @ 2d4fb27b
......@@ -2444,44 +2444,19 @@ COMMON_GTESTS = {
'vr_browser_tests': {
'tester_configs': [
{
'predicate': Predicates.FYI_ONLY,
'os_types': ['win']
},
],
# We currently only want to run this on Win10 Release (NVIDIA)
'disabled_tester_configs': [
{
'names': [
# TODO(kbr): delete old names. crbug.com/792780
'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)',
'Win7 FYI Release (NVIDIA)',
'Win7 FYI Debug (NVIDIA)',
'Win10 FYI dEQP Release (NVIDIA)',
'Win10 FYI Experimental Release (NVIDIA)',
'Win10 FYI Debug (NVIDIA)',
'Win7 FYI Release (AMD)',
'Win7 FYI Debug (AMD)',
'Win7 FYI dEQP Release (AMD)',
'Win10 FYI Release (Intel HD 630)',
'Win10 FYI Release (NVIDIA Quadro P400)',
'Win7 FYI x64 Release (NVIDIA)',
'Win7 FYI x64 Debug (NVIDIA)',
'Win7 FYI x64 dEQP Release (NVIDIA)',
'predicate': Predicates.DEFAULT_AND_OPTIONAL,
'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',
}
],
}
},
],
'args': [
'--enable-gpu',
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 2d4fb27b
......@@ -21006,6 +21006,28 @@
"test": "angle_white_box_tests",
"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": [
"--use-gpu-in-tests",
......@@ -21310,6 +21332,37 @@
},
"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": [
"--use-gpu-in-tests",
......@@ -21819,6 +21872,28 @@
"test": "angle_white_box_tests",
"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": [
"--use-gpu-in-tests",
......@@ -22505,6 +22580,28 @@
"test": "angle_white_box_tests",
"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": [
"--use-gpu-in-tests",
......@@ -23212,6 +23309,28 @@
"test": "browser_tests",
"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": [
"--use-gpu-in-tests",
......@@ -25198,6 +25317,28 @@
"test": "browser_tests",
"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": [
"--use-gpu-in-tests",
......
testing/buildbot/chromium.gpu.json
View file @ 2d4fb27b
......@@ -2433,6 +2433,28 @@
"test": "angle_unittests",
"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": [
"--use-gpu-in-tests",
......@@ -2848,6 +2870,37 @@
},
"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": [
"--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