Skip to content

Commit

Permalink
Run angle_white_box_tests on Win GPU.FYI
Browse files Browse the repository at this point in the history 
These tests were split off angle_end2end_tests (which are now black box),
so this restores them back to running on the bots.

Run only on Windows bots, as for now this is the only platform
which has white box tests, and running 0 tests is considered a failure
by some platforms (i.e. Android).

BUG=691136
CQ_INCLUDE_TRYBOTS=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;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2689873002
Cr-Commit-Position: refs/heads/master@{#450975}
  • Loading branch information
@y-novikov
y-novikov authored and Commit bot committed Feb 16, 2017
1 parent 3de4623 commit 55e66c2
Show file tree
Hide file tree
Showing 4 changed files with 278 additions and 0 deletions.
1 change: 1 addition & 0 deletions BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ group("both_gn_and_gyp") {
"//third_party/WebKit/Source/wtf:wtf_unittests",
"//third_party/angle/src/tests:angle_end2end_tests",
"//third_party/angle/src/tests:angle_unittests",
"//third_party/angle/src/tests:angle_white_box_tests",
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
"//third_party/smhasher:pmurhash",
"//tools/imagediff($host_toolchain)",
Expand Down
16 changes: 16 additions & 0 deletions content/test/gpu/generate_buildbot_json.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,22 @@ def DEFAULT_PLUS_V8(x):
'--test-launcher-retry-limit=0'
]
},
# white_box tests should run where end2end tests run
'angle_white_box_tests': {
'tester_configs': [
{
'predicate': Predicates.FYI_AND_OPTIONAL,
# There are only Windows white box tests for now.
# Enable on more configs when there will be relevant tests.
'os_types': ['win'],
},
],
'desktop_args': [
# ANGLE test retries deliberately disabled to prevent flakiness.
# http://crbug.com/669196
'--test-launcher-retry-limit=0'
]
},
'angle_unittests': {
'desktop_args': [
'--use-gpu-in-tests',
Expand Down
256 changes: 256 additions & 0 deletions testing/buildbot/chromium.gpu.fyi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10339,6 +10339,22 @@
"test": "angle_end2end_tests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests",
Expand Down Expand Up @@ -10535,6 +10551,22 @@
"test": "angle_end2end_tests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests",
Expand Down Expand Up @@ -10752,6 +10784,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": false,
"dimension_sets": [
{
"gpu": "8086:1912",
"os": "Windows-10"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -11219,6 +11267,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-10"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -11686,6 +11750,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": false,
"dimension_sets": [
{
"gpu": "8086:1912",
"os": "Windows-10"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -12192,6 +12272,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": false,
"dimension_sets": [
{
"gpu": "10de:1430",
"os": "Windows-10"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -12698,6 +12794,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-10"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -13207,6 +13319,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -13651,6 +13779,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -14101,6 +14245,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": false,
"dimension_sets": [
{
"gpu": "1002:6779",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -14622,6 +14782,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -15108,6 +15284,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": false,
"dimension_sets": [
{
"gpu": "8086:041a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -15591,6 +15783,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": false,
"dimension_sets": [
{
"gpu": "10de:0f02",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -16189,6 +16397,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -16714,6 +16938,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down Expand Up @@ -17216,6 +17456,22 @@
"test": "angle_unittests",
"use_xvfb": false
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:104a",
"os": "Windows-2008ServerR2-SP1"
}
]
},
"test": "angle_white_box_tests",
"use_xvfb": false
},
{
"args": [
"--use-gpu-in-tests"
Expand Down
Loading

0 comments on commit 55e66c2

Please sign in to comment.