Index: testing/buildbot/chromium.gpu.json |
diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json |
index 0fb25e382dd7760c400079bf901dc89fc3f6d25d..b6b733e815d0c86ac8e9147c5cfe2fff1f43b03f 100644 |
--- a/testing/buildbot/chromium.gpu.json |
+++ b/testing/buildbot/chromium.gpu.json |
@@ -337,25 +337,6 @@ |
}, |
{ |
"args": [ |
- "--enable-gpu", |
- "--test-launcher-jobs=1", |
- "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter" |
- ], |
- "name": "tab_capture_end2end_tests", |
- "swarming": { |
- "can_use_on_swarming_builders": true, |
- "dimension_sets": [ |
- { |
- "gpu": "10de:104a", |
- "os": "Ubuntu" |
- } |
- ] |
- }, |
- "test": "browser_tests", |
- "use_xvfb": false |
- }, |
- { |
- "args": [ |
"--use-gpu-in-tests" |
], |
"swarming": { |
@@ -384,6 +365,19 @@ |
] |
}, |
"test": "gl_unittests", |
+ "use_xvfb": false |
+ }, |
+ { |
+ "swarming": { |
+ "can_use_on_swarming_builders": true, |
+ "dimension_sets": [ |
+ { |
+ "gpu": "10de:104a", |
+ "os": "Ubuntu" |
+ } |
+ ] |
+ }, |
+ "test": "tab_capture_end2end_tests", |
"use_xvfb": false |
} |
], |
@@ -974,25 +968,6 @@ |
}, |
{ |
"args": [ |
- "--enable-gpu", |
- "--test-launcher-jobs=1", |
- "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter" |
- ], |
- "name": "tab_capture_end2end_tests", |
- "swarming": { |
- "can_use_on_swarming_builders": true, |
- "dimension_sets": [ |
- { |
- "gpu": "8086:0a2e", |
- "os": "Mac-10.12" |
- } |
- ] |
- }, |
- "test": "browser_tests", |
- "use_xvfb": false |
- }, |
- { |
- "args": [ |
"--use-gpu-in-tests" |
], |
"swarming": { |
@@ -1021,6 +996,19 @@ |
] |
}, |
"test": "gl_unittests", |
+ "use_xvfb": false |
+ }, |
+ { |
+ "swarming": { |
+ "can_use_on_swarming_builders": true, |
+ "dimension_sets": [ |
+ { |
+ "gpu": "8086:0a2e", |
+ "os": "Mac-10.12" |
+ } |
+ ] |
+ }, |
+ "test": "tab_capture_end2end_tests", |
"use_xvfb": false |
} |
], |
@@ -1625,26 +1613,6 @@ |
}, |
{ |
"args": [ |
- "--enable-gpu", |
- "--test-launcher-jobs=1", |
- "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter" |
- ], |
- "name": "tab_capture_end2end_tests", |
- "swarming": { |
- "can_use_on_swarming_builders": true, |
- "dimension_sets": [ |
- { |
- "gpu": "1002:6821", |
- "hidpi": "1", |
- "os": "Mac" |
- } |
- ] |
- }, |
- "test": "browser_tests", |
- "use_xvfb": false |
- }, |
- { |
- "args": [ |
"--use-gpu-in-tests" |
], |
"swarming": { |
@@ -1675,6 +1643,20 @@ |
] |
}, |
"test": "gl_unittests", |
+ "use_xvfb": false |
+ }, |
+ { |
+ "swarming": { |
+ "can_use_on_swarming_builders": true, |
+ "dimension_sets": [ |
+ { |
+ "gpu": "1002:6821", |
+ "hidpi": "1", |
+ "os": "Mac" |
+ } |
+ ] |
+ }, |
+ "test": "tab_capture_end2end_tests", |
"use_xvfb": false |
} |
], |
@@ -2294,25 +2276,6 @@ |
}, |
{ |
"args": [ |
- "--enable-gpu", |
- "--test-launcher-jobs=1", |
- "--test-launcher-filter-file=../../testing/buildbot/filters/tab-capture-end2end-tests.browser_tests.filter" |
- ], |
- "name": "tab_capture_end2end_tests", |
- "swarming": { |
- "can_use_on_swarming_builders": true, |
- "dimension_sets": [ |
- { |
- "gpu": "10de:104a", |
- "os": "Windows-2008ServerR2-SP1" |
- } |
- ] |
- }, |
- "test": "browser_tests", |
- "use_xvfb": false |
- }, |
- { |
- "args": [ |
"--use-gpu-in-tests" |
], |
"swarming": { |
@@ -2341,6 +2304,19 @@ |
] |
}, |
"test": "gl_unittests", |
+ "use_xvfb": false |
+ }, |
+ { |
+ "swarming": { |
+ "can_use_on_swarming_builders": true, |
+ "dimension_sets": [ |
+ { |
+ "gpu": "10de:104a", |
+ "os": "Windows-2008ServerR2-SP1" |
+ } |
+ ] |
+ }, |
+ "test": "tab_capture_end2end_tests", |
"use_xvfb": false |
}, |
{ |