OLD | NEW |
1 { | 1 { |
2 "Linux ChromiumOS Builder": { | 2 "Linux ChromiumOS Builder": { |
3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
4 "All" | 4 "All" |
5 ] | 5 ] |
6 }, | 6 }, |
7 "Linux ChromiumOS Ozone Tests (1)": { | 7 "Linux ChromiumOS Ozone Tests (1)": { |
8 "gtest_tests": [ | 8 "gtest_tests": [ |
9 { | 9 { |
10 "swarming": { | 10 "swarming": { |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 { | 57 { |
58 "swarming": { | 58 "swarming": { |
59 "can_use_on_swarming_builders": true | 59 "can_use_on_swarming_builders": true |
60 }, | 60 }, |
61 "test": "base_unittests" | 61 "test": "base_unittests" |
62 }, | 62 }, |
63 { | 63 { |
64 "args": [ | 64 "args": [ |
65 "--override-use-gl-with-osmesa-for-tests", | 65 "--override-use-gl-with-osmesa-for-tests", |
66 "--run-in-mash", | 66 "--run-in-mash", |
| 67 "--service-overrides=src/chrome/app/mash/mash_service_overrides.json", |
67 "--test-launcher-filter-file=src/testing/buildbot/filters/mash.browser
_tests.filter", | 68 "--test-launcher-filter-file=src/testing/buildbot/filters/mash.browser
_tests.filter", |
68 "--use-test-config" | 69 "--use-test-config" |
69 ], | 70 ], |
70 "hard_timeout": 60, | 71 "hard_timeout": 60, |
71 "name": "mash_browser_tests", | 72 "name": "mash_browser_tests", |
72 "swarming": { | 73 "swarming": { |
73 "can_use_on_swarming_builders": false | 74 "can_use_on_swarming_builders": false |
74 }, | 75 }, |
75 "test": "browser_tests" | 76 "test": "browser_tests" |
76 }, | 77 }, |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 { | 480 { |
480 "swarming": { | 481 "swarming": { |
481 "can_use_on_swarming_builders": true | 482 "can_use_on_swarming_builders": true |
482 }, | 483 }, |
483 "test": "base_unittests" | 484 "test": "base_unittests" |
484 }, | 485 }, |
485 { | 486 { |
486 "args": [ | 487 "args": [ |
487 "--override-use-gl-with-osmesa-for-tests", | 488 "--override-use-gl-with-osmesa-for-tests", |
488 "--run-in-mash", | 489 "--run-in-mash", |
| 490 "--service-overrides=src/chrome/app/mash/mash_service_overrides.json", |
489 "--test-launcher-filter-file=src/testing/buildbot/filters/mash.browser
_tests.filter", | 491 "--test-launcher-filter-file=src/testing/buildbot/filters/mash.browser
_tests.filter", |
490 "--use-test-config" | 492 "--use-test-config" |
491 ], | 493 ], |
492 "hard_timeout": 60, | 494 "hard_timeout": 60, |
493 "name": "mash_browser_tests", | 495 "name": "mash_browser_tests", |
494 "swarming": { | 496 "swarming": { |
495 "can_use_on_swarming_builders": false | 497 "can_use_on_swarming_builders": false |
496 }, | 498 }, |
497 "test": "browser_tests" | 499 "test": "browser_tests" |
498 }, | 500 }, |
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1157 }, | 1159 }, |
1158 { | 1160 { |
1159 "swarming": { | 1161 "swarming": { |
1160 "can_use_on_swarming_builders": true | 1162 "can_use_on_swarming_builders": true |
1161 }, | 1163 }, |
1162 "test": "wm_unittests" | 1164 "test": "wm_unittests" |
1163 } | 1165 } |
1164 ] | 1166 ] |
1165 } | 1167 } |
1166 } | 1168 } |
OLD | NEW |