| OLD | NEW |
| 1 { | 1 { |
| 2 "Chromium Mojo Android": { | 2 "Chromium Mojo Android": { |
| 3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
| 4 "mash:all" | 4 "mash:all" |
| 5 ] | 5 ] |
| 6 }, | 6 }, |
| 7 "Chromium Mojo Linux": { | 7 "Chromium Mojo Linux": { |
| 8 "additional_compile_targets": [ | 8 "additional_compile_targets": [ |
| 9 "mash:all" | 9 "mash:all" |
| 10 ], | 10 ], |
| 11 "gtest_tests": [ | 11 "gtest_tests": [ |
| 12 { | 12 { |
| 13 "args": [ | 13 "args": [ |
| 14 "--override-use-gl-with-osmesa-for-tests", | 14 "--override-use-gl-with-osmesa-for-tests", |
| 15 "--run-in-mash", | 15 "--run-in-mash", |
| 16 "--test-launcher-filter-file=src/testing/buildbot/filters/mojo.fyi.bro
wser_tests.filter", | 16 "--test-launcher-filter-file=src/testing/buildbot/filters/mojo.fyi.bro
wser_tests.filter", |
| 17 "--use-test-config" | 17 "--use-test-config" |
| 18 ], | 18 ], |
| 19 "test": "browser_tests" | 19 "test": "browser_tests" |
| 20 }, | 20 }, |
| 21 { | 21 { |
| 22 "test": "media_mojo_shell_unittests" | 22 "test": "media_mojo_shell_unittests" |
| 23 }, | 23 }, |
| 24 { | 24 { |
| 25 "test": "mus_ws_unittests" | 25 "test": "mus_ws_unittests" |
| 26 }, | 26 }, |
| 27 { | 27 { |
| 28 "test": "views_mus_interactive_ui_tests" |
| 29 }, |
| 30 { |
| 28 "test": "views_mus_unittests" | 31 "test": "views_mus_unittests" |
| 29 } | 32 } |
| 30 ] | 33 ] |
| 31 }, | 34 }, |
| 32 "Chromium Mojo Windows": { | 35 "Chromium Mojo Windows": { |
| 33 "additional_compile_targets": [ | 36 "additional_compile_targets": [ |
| 34 "mash:all" | 37 "mash:all" |
| 35 ], | 38 ], |
| 36 "gtest_tests": [ | 39 "gtest_tests": [ |
| 37 { | 40 { |
| 38 "args": [ | 41 "args": [ |
| 39 "--override-use-gl-with-osmesa-for-tests", | 42 "--override-use-gl-with-osmesa-for-tests", |
| 40 "--run-in-mash", | 43 "--run-in-mash", |
| 41 "--test-launcher-filter-file=src/testing/buildbot/filters/mojo.fyi.bro
wser_tests.filter" | 44 "--test-launcher-filter-file=src/testing/buildbot/filters/mojo.fyi.bro
wser_tests.filter" |
| 42 ], | 45 ], |
| 43 "test": "browser_tests" | 46 "test": "browser_tests" |
| 44 }, | 47 }, |
| 45 { | 48 { |
| 46 "test": "media_mojo_shell_unittests" | 49 "test": "media_mojo_shell_unittests" |
| 47 }, | 50 }, |
| 48 { | 51 { |
| 49 "test": "mus_ws_unittests" | 52 "test": "mus_ws_unittests" |
| 50 }, | 53 }, |
| 51 { | 54 { |
| 55 "test": "views_mus_interactive_ui_tests" |
| 56 }, |
| 57 { |
| 52 "test": "views_mus_unittests" | 58 "test": "views_mus_unittests" |
| 53 } | 59 } |
| 54 ] | 60 ] |
| 55 } | 61 } |
| 56 } | 62 } |
| OLD | NEW |