diff options
| author | msw <msw@chromium.org> | 2015-04-27 17:06:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 00:06:36 +0000 |
| commit | 84ba30ab51ce83cd8e4e34fbf5af0301af2033e6 (patch) | |
| tree | 57673a68735e9912a22f8adfe824ccf5517d48b4 /mojo | |
| parent | 2433e6ab2206fad3bc5954fd61e9d4785ccab108 (diff) | |
| download | chromium_src-84ba30ab51ce83cd8e4e34fbf5af0301af2033e6.zip chromium_src-84ba30ab51ce83cd8e4e34fbf5af0301af2033e6.tar.gz chromium_src-84ba30ab51ce83cd8e4e34fbf5af0301af2033e6.tar.bz2 | |
Skip gl surface init when headless; enable wm apptests.
Skip native_viewport's init of gfx::GLSurface when headless.
Remove the unused --use-osmesa flag (--use-test-config suffices?).
Re-enable the window_manager_apptests again; fingers crossed.
BUG=480040
TEST=Bot passes window_manager_apptests.
R=sky@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1103413002
Cr-Commit-Position: refs/heads/master@{#327184}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/tools/data/apptests | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests index 0bcd7fd..a35da32 100644 --- a/mojo/tools/data/apptests +++ b/mojo/tools/data/apptests @@ -44,9 +44,8 @@ tests = [ "type": "gtest_isolated", "shell-args": ["--url-mappings=mojo:window_manager=mojo:test_window_manager"] }, - # TODO(msw): Fix and enable window_manager_apptests: http://crbug.com/480040 - #{ - # "test": "mojo:window_manager_apptests", - # "shell-args": ["--use-test-config", "--use-headless-config"] - #}, + { + "test": "mojo:window_manager_apptests", + "shell-args": ["--use-headless-config"] + }, ] |