Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(496)

Side by Side Diff: mojo/tools/data/apptests

Issue 1345783002: Updates mojo:view_manager -> mojo:mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/runner/android/main.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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',
11 # # Optional display name (otherwise the entry for 'test' above is used). 11 # # Optional display name (otherwise the entry for 'test' above is used).
12 # 'name': 'mojo:test_app_url (more details)', 12 # 'name': 'mojo:test_app_url (more details)',
13 # # Optional test type. Valid values: 13 # # Optional test type. Valid values:
14 # # * 'gtest': (default) 14 # # * 'gtest': (default)
15 # # * 'gtest_isolated': like 'gtest', but run with fixture isolation. 15 # # * 'gtest_isolated': like 'gtest', but run with fixture isolation.
16 # # i.e., each test in a fresh mojo_shell 16 # # i.e., each test in a fresh mojo_shell
17 # 'type': 'gtest', 17 # 'type': 'gtest',
18 # # Optional arguments for the shell or test. 18 # # Optional arguments for the shell or test.
19 # 'args': ['--some-flag-for-the-shell', '--some-flag-for-the-test'], 19 # 'args': ['--some-flag-for-the-shell', '--some-flag-for-the-test'],
20 # } 20 # }
21 # 21 #
22 # TODO(vtl|msw): Add a way of specifying data dependencies. 22 # TODO(vtl|msw): Add a way of specifying data dependencies.
23 23
24 view_manager_apptests = { 'test': 'mojo:view_manager_apptests' } 24 mus_apptests = { 'test': 'mojo:mus_apptests' }
25 # osmesa is not used on android, so no flags are needed for 25 # osmesa is not used on android, so no flags are needed for
26 # view_manager_apptests. 26 # mus_apptests.
27 if config.target_os != config.OS_ANDROID: 27 if config.target_os != config.OS_ANDROID:
28 view_manager_apptests['args'] = [ '--use-x11-test-config', 28 mus_apptests['args'] = [ '--use-x11-test-config',
29 '--override-use-gl-with-osmesa-for-tests' ] 29 '--override-use-gl-with-osmesa-for-tests' ]
30 30
31 tests = [ 31 tests = [
32 { 32 {
33 'test': 'mojo:clipboard_apptests', 33 'test': 'mojo:clipboard_apptests',
34 'type': 'gtest_isolated', 34 'type': 'gtest_isolated',
35 }, 35 },
36 { 36 {
37 'test': 'mojo:network_service_apptests', 37 'test': 'mojo:network_service_apptests',
38 'type': 'gtest_isolated', 38 'type': 'gtest_isolated',
39 }, 39 },
40 { 40 {
41 'test': 'mojo:resource_provider_apptests', 41 'test': 'mojo:resource_provider_apptests',
42 'type': 'gtest_isolated', 42 'type': 'gtest_isolated',
43 }, 43 },
44 # TODO(msw|jam): Fix and enable the runner_apptests: http://crbug.com/479316 44 # TODO(msw|jam): Fix and enable the runner_apptests: http://crbug.com/479316
45 #{ 45 #{
46 # 'test': 'mojo:runner_apptests', 46 # 'test': 'mojo:runner_apptests',
47 # 'type': 'gtest_isolated', 47 # 'type': 'gtest_isolated',
48 #}, 48 #},
49 view_manager_apptests, 49 mus_apptests,
50 ] 50 ]
51 51
52 # TODO(msw): Get these tests passing on Android too. http://crbug.com/486220 52 # TODO(msw): Get these tests passing on Android too. http://crbug.com/486220
53 if config.target_os != config.OS_ANDROID: 53 if config.target_os != config.OS_ANDROID:
54 tests += [ 54 tests += [
55 { 55 {
56 'test': 'mojo:filesystem_apptests', 56 'test': 'mojo:filesystem_apptests',
57 'type': 'gtest_isolated', 57 'type': 'gtest_isolated',
58 }, 58 },
59 { 59 {
(...skipping 29 matching lines...) Expand all
89 'test': 'mojo:sql_apptests', 89 'test': 'mojo:sql_apptests',
90 'type': 'gtest_isolated', 90 'type': 'gtest_isolated',
91 }, 91 },
92 { 92 {
93 'test': 'mojo:web_view_apptests', 93 'test': 'mojo:web_view_apptests',
94 'type': 'gtest_isolated', 94 'type': 'gtest_isolated',
95 'args': ['--use-x11-test-config', 95 'args': ['--use-x11-test-config',
96 '--override-use-gl-with-osmesa-for-tests'] 96 '--override-use-gl-with-osmesa-for-tests']
97 }, 97 },
98 ] 98 ]
OLDNEW
« no previous file with comments | « mojo/runner/android/main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698