Skip to content

GitLab

T
tangled
Commit 4d8e9e89 authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot
Browse files
Options

Run blink unit tests under swarming on chromium.webkit mac bots. 

R=jbudorick@chromium.org

Change-Id: I480364ec2aa241cdfc9b0f016cdb008f5226ecac
Reviewed-on: https://chromium-review.googlesource.com/821558
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524409}
parent 01e52637
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 185 deletions
testing/buildbot/chromium.webkit.json
View file @ 4d8e9e89
...@@ -302,25 +302,49 @@ ...@@ -302,25 +302,49 @@
"gtest_tests": [ "gtest_tests": [
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.10.5"
}
]
}, },
"test": "blink_heap_unittests" "test": "blink_heap_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.10.5"
}
]
}, },
"test": "blink_platform_unittests" "test": "blink_platform_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.10.5"
}
]
}, },
"test": "webkit_unit_tests" "test": "webkit_unit_tests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.10.5"
}
]
}, },
"test": "wtf_unittests" "test": "wtf_unittests"
} }
...@@ -363,25 +387,49 @@ ...@@ -363,25 +387,49 @@
"gtest_tests": [ "gtest_tests": [
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "blink_heap_unittests" "test": "blink_heap_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "blink_platform_unittests" "test": "blink_platform_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "webkit_unit_tests" "test": "webkit_unit_tests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "wtf_unittests" "test": "wtf_unittests"
} }
...@@ -424,25 +472,49 @@ ...@@ -424,25 +472,49 @@
"gtest_tests": [ "gtest_tests": [
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "blink_heap_unittests" "test": "blink_heap_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "blink_platform_unittests" "test": "blink_platform_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "webkit_unit_tests" "test": "webkit_unit_tests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"os": "Mac-10.11.6"
}
]
}, },
"test": "wtf_unittests" "test": "wtf_unittests"
} }
...@@ -488,25 +560,57 @@ ...@@ -488,25 +560,57 @@
"gtest_tests": [ "gtest_tests": [
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.12.6",
"pool": "Chrome-GPU"
}
]
}, },
"test": "blink_heap_unittests" "test": "blink_heap_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.12.6",
"pool": "Chrome-GPU"
}
]
}, },
"test": "blink_platform_unittests" "test": "blink_platform_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.12.6",
"pool": "Chrome-GPU"
}
]
}, },
"test": "webkit_unit_tests" "test": "webkit_unit_tests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.12.6",
"pool": "Chrome-GPU"
}
]
}, },
"test": "wtf_unittests" "test": "wtf_unittests"
} }
...@@ -551,25 +655,53 @@ ...@@ -551,25 +655,53 @@
"gtest_tests": [ "gtest_tests": [
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"hidpi": "0",
"os": "Mac-10.12.6"
}
]
}, },
"test": "blink_heap_unittests" "test": "blink_heap_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"hidpi": "0",
"os": "Mac-10.12.6"
}
]
}, },
"test": "blink_platform_unittests" "test": "blink_platform_unittests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"hidpi": "0",
"os": "Mac-10.12.6"
}
]
}, },
"test": "webkit_unit_tests" "test": "webkit_unit_tests"
}, },
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"hidpi": "0",
"os": "Mac-10.12.6"
}
]
}, },
"test": "wtf_unittests" "test": "wtf_unittests"
} }
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 4d8e9e89
...@@ -286,32 +286,6 @@ ...@@ -286,32 +286,6 @@
'hard_timeout': 120, 'hard_timeout': 120,
}, },
}, },
# chromium.webkit
'WebKit Mac10.10': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (dbg)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (retina)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.12': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
}, },
}, },
'blink_platform_unittests': { 'blink_platform_unittests': {
...@@ -344,34 +318,6 @@ ...@@ -344,34 +318,6 @@
'Win10 Tests x64', 'Win10 Tests x64',
'Win7 Tests (dbg)(1)', 'Win7 Tests (dbg)(1)',
], ],
'modifications': {
# on chromium.webkit
'WebKit Mac10.10': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (dbg)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (retina)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.12': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
}
}, },
'boringssl_crypto_tests': { 'boringssl_crypto_tests': {
'remove_from': [ 'remove_from': [
...@@ -588,32 +534,6 @@ ...@@ -588,32 +534,6 @@
'shards': 20, 'shards': 20,
}, },
}, },
# on chromium.webkit
'WebKit Mac10.10': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (dbg)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (retina)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.12': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
# client.v8.chromium # client.v8.chromium
'Linux - Future (dbg)': { 'Linux - Future (dbg)': {
'swarming': { 'swarming': {
...@@ -4347,23 +4267,11 @@ ...@@ -4347,23 +4267,11 @@
}, },
'WebKit Mac10.10': { 'WebKit Mac10.10': {
'swarming': { 'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.10.5',
}
],
'shards': 4, 'shards': 4,
}, },
}, },
'WebKit Mac10.11': { 'WebKit Mac10.11': {
'swarming': { 'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.11.6',
}
],
'shards': 4, 'shards': 4,
}, },
}, },
...@@ -4372,37 +4280,16 @@ ...@@ -4372,37 +4280,16 @@
'--debug', '--debug',
], ],
'swarming': { 'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.11.6',
}
],
'shards': 4, 'shards': 4,
}, },
}, },
'WebKit Mac10.11 (retina)': { 'WebKit Mac10.11 (retina)': {
'swarming': { 'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.12.6',
'pool': 'Chrome-GPU',
}
],
'shards': 4, 'shards': 4,
}, },
}, },
'WebKit Mac10.12': { 'WebKit Mac10.12': {
'swarming': { 'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'hidpi': '0',
'os': 'Mac-10.12.6',
},
],
'shards': 4, 'shards': 4,
}, },
}, },
...@@ -4542,31 +4429,6 @@ ...@@ -4542,31 +4429,6 @@
'Win7 Tests (dbg)(1)', 'Win7 Tests (dbg)(1)',
], ],
'modifications': { 'modifications': {
'WebKit Mac10.10': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (dbg)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (retina)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.12': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
# chromium.memory # chromium.memory
'Linux ASan LSan Tests (1)': { 'Linux ASan LSan Tests (1)': {
# These are very slow on the ASAN trybot for some reason. # These are very slow on the ASAN trybot for some reason.
...@@ -4760,33 +4622,6 @@ ...@@ -4760,33 +4622,6 @@
'Win10 Tests x64', 'Win10 Tests x64',
'Win7 Tests (dbg)(1)', 'Win7 Tests (dbg)(1)',
], ],
'modifications': {
'WebKit Mac10.10': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (dbg)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.11 (retina)': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'WebKit Mac10.12': {
'swarming': {
'can_use_on_swarming_builders': False,
},
},
},
}, },
'zucchini_unittests': { 'zucchini_unittests': {
'remove_from': [ 'remove_from': [
......
testing/buildbot/waterfalls.pyl
View file @ 4d8e9e89
...@@ -1678,6 +1678,14 @@ ...@@ -1678,6 +1678,14 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
'scripts': 'chromium_webkit_scripts', 'scripts': 'chromium_webkit_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.10.5',
}
],
},
}, },
'WebKit Mac10.11': { 'WebKit Mac10.11': {
'test_suites': { 'test_suites': {
...@@ -1685,6 +1693,14 @@ ...@@ -1685,6 +1693,14 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
'scripts': 'chromium_webkit_scripts', 'scripts': 'chromium_webkit_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.11.6',
}
],
},
}, },
'WebKit Mac10.11 (dbg)': { 'WebKit Mac10.11 (dbg)': {
'test_suites': { 'test_suites': {
...@@ -1692,6 +1708,14 @@ ...@@ -1692,6 +1708,14 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
'scripts': 'chromium_webkit_scripts', 'scripts': 'chromium_webkit_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'gpu': 'none',
'os': 'Mac-10.11.6',
}
],
},
}, },
'WebKit Mac10.11 (retina)': { 'WebKit Mac10.11 (retina)': {
'test_suites': { 'test_suites': {
...@@ -1699,6 +1723,16 @@ ...@@ -1699,6 +1723,16 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
'scripts': 'chromium_webkit_scripts', 'scripts': 'chromium_webkit_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'gpu': '1002:6821',
'hidpi': '1',
'os': 'Mac-10.12.6',
'pool': 'Chrome-GPU',
}
],
},
}, },
'WebKit Mac10.12': { 'WebKit Mac10.12': {
'test_suites': { 'test_suites': {
...@@ -1706,6 +1740,15 @@ ...@@ -1706,6 +1740,15 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
'scripts': 'chromium_webkit_scripts', 'scripts': 'chromium_webkit_scripts',
}, },
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'hidpi': '0',
'os': 'Mac-10.12.6',
},
],
},
}, },
'WebKit Win x64 Builder': { 'WebKit Win x64 Builder': {
'test_suites': { 'test_suites': {
......
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