diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 19:25:41 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 19:25:41 +0000 |
| commit | aa5219d8ce13c523e8be330405b7dc5834ca52f6 (patch) | |
| tree | 743d53ae146debc37a09dc2fae48caed444bc1ae /chrome/chrome_tests.gypi | |
| parent | 7ff863ecfc6a38a23e9bdf75bcea5b40b80e2f87 (diff) | |
| download | chromium_src-aa5219d8ce13c523e8be330405b7dc5834ca52f6.zip chromium_src-aa5219d8ce13c523e8be330405b7dc5834ca52f6.tar.gz chromium_src-aa5219d8ce13c523e8be330405b7dc5834ca52f6.tar.bz2 | |
linux_aura: Turn aura on on the main linux builders.
This is essentially a revert of r227214. In the interim, we've enabled interactive_ui_tests, switched to openbox on the bots to theoretically fix browser_tests, and have a speculative nacl integration crash fix.
BUG=125106,303342,304554,125106,304555,316716,316919
Review URL: https://codereview.chromium.org/26622003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index cc9c52b..fdac810 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1726,6 +1726,13 @@ '../ash/ash.gyp:ash_test_support', ], }], + ['use_aura==1 and desktop_linux==1', { + 'sources!': [ + # TODO(erg): A large number of the PPAPI browsertests flakily + # timeout. + 'test/ppapi/ppapi_browsertest.cc', + ], + }], ['chromeos==0', { 'sources/': [ ['exclude', '^browser/chromeos'], |