summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 21:24:24 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 21:24:24 +0000
commit017b4f7b3f6f59a62cd296caa66db693aabd7cde (patch)
tree7eea8dbb69272b436a1dca2a9003f720985da2a6
parent53432a6a1ff43e0a0a94442e9c1242d00aa0072f (diff)
downloadchromium_src-017b4f7b3f6f59a62cd296caa66db693aabd7cde.zip
chromium_src-017b4f7b3f6f59a62cd296caa66db693aabd7cde.tar.gz
chromium_src-017b4f7b3f6f59a62cd296caa66db693aabd7cde.tar.bz2
Exclude another ash-specific browser test from windows build to get browser_tests passing on win aura (which defines use_ash always).
Review URL: https://codereview.chromium.org/11377167 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167749 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_tests.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b03b2dd..87d04ad 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1367,6 +1367,7 @@
'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
+ 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
],
}, { # else: OS != "win"
'sources!': [
@@ -2674,7 +2675,7 @@
# Win bot needs to be turned into an interactive bot.
'interactive_ui_tests',
# Disabled from running in coverage_posix.py.
- # We need to build this during compile step, so enabling here.
+ # We need to build this during compile step, so enabling here.
'browser_tests',
'../courgette/courgette.gyp:courgette_unittests',
'../crypto/crypto.gyp:crypto_unittests',