| OLD | NEW |
| 1 # This file contains a list of Mojo gtest unit tests. | 1 # This file contains a list of Mojo gtest unit tests. |
| 2 # | 2 # |
| 3 # This must be valid Python. It may use the |config| global that will be a | 3 # This must be valid Python. It may use the |config| global that will be a |
| 4 # mopy.config.Config object, and must set a |tests| global that will contain the | 4 # mopy.config.Config object, and must set a |tests| global that will contain the |
| 5 # list of tests to run. | 5 # list of tests to run. |
| 6 # | 6 # |
| 7 # The entries in |tests| are dictionaries of the following form: | 7 # The entries in |tests| are dictionaries of the following form: |
| 8 # { | 8 # { |
| 9 # # Required URL for apptest. | 9 # # Required URL for apptest. |
| 10 # 'test': 'mojo:test_app_url', | 10 # 'test': 'mojo:test_app_url', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #{ | 28 #{ |
| 29 # 'test': 'mojo:runner_apptests', | 29 # 'test': 'mojo:runner_apptests', |
| 30 # 'type': 'gtest_isolated', | 30 # 'type': 'gtest_isolated', |
| 31 #}, | 31 #}, |
| 32 ] | 32 ] |
| 33 | 33 |
| 34 # TODO(msw): Get these tests passing on Android too. http://crbug.com/486220 | 34 # TODO(msw): Get these tests passing on Android too. http://crbug.com/486220 |
| 35 if config.target_os != config.OS_ANDROID: | 35 if config.target_os != config.OS_ANDROID: |
| 36 tests += [ | 36 tests += [ |
| 37 { | 37 { |
| 38 'test': 'mojo:mash_wm_apptests', | |
| 39 'type': 'gtest_isolated', | |
| 40 'args': ['--use-x11-test-config', | |
| 41 '--override-use-gl-with-osmesa-for-tests'] | |
| 42 }, | |
| 43 { | |
| 44 'test': 'mojo:media_apptests', | 38 'test': 'mojo:media_apptests', |
| 45 'type': 'gtest_isolated', | 39 'type': 'gtest_isolated', |
| 46 }, | 40 }, |
| 47 # TODO(media): these tests fail in debug, which has no bot-coverage. | 41 # TODO(media): these tests fail in debug, which has no bot-coverage. |
| 48 # http://crbug.com/587523 | 42 # http://crbug.com/587523 |
| 49 # { | 43 # { |
| 50 # 'test': 'mojo:media_pipeline_integration_apptests', | 44 # 'test': 'mojo:media_pipeline_integration_apptests', |
| 51 # 'type': 'gtest_isolated', | 45 # 'type': 'gtest_isolated', |
| 52 # }, | 46 # }, |
| 53 ] | 47 ] |
| OLD | NEW |