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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables' : { 5 'variables' : {
6 'chromedriver_unittest_sources': [ 6 'chromedriver_unittest_sources': [
7 'test/chromedriver/capabilities_unittest.cc', 7 'test/chromedriver/capabilities_unittest.cc',
8 'test/chromedriver/chrome/chrome_finder_unittest.cc', 8 'test/chromedriver/chrome/chrome_finder_unittest.cc',
9 'test/chromedriver/chrome/console_logger_unittest.cc', 9 'test/chromedriver/chrome/console_logger_unittest.cc',
10 'test/chromedriver/chrome/device_manager_unittest.cc', 10 'test/chromedriver/chrome/device_manager_unittest.cc',
(...skipping 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 ['debug_devtools==1', { 1719 ['debug_devtools==1', {
1720 'defines': [ 1720 'defines': [
1721 'DEBUG_DEVTOOLS=1', 1721 'DEBUG_DEVTOOLS=1',
1722 ], 1722 ],
1723 }], 1723 }],
1724 ['use_ash==1', { 1724 ['use_ash==1', {
1725 'dependencies': [ 1725 'dependencies': [
1726 '../ash/ash.gyp:ash_test_support', 1726 '../ash/ash.gyp:ash_test_support',
1727 ], 1727 ],
1728 }], 1728 }],
1729 ['use_aura==1 and desktop_linux==1', {
1730 'sources!': [
1731 # TODO(erg): A large number of the PPAPI browsertests flakily
1732 # timeout.
1733 'test/ppapi/ppapi_browsertest.cc',
1734 ],
1735 }],
1729 ['chromeos==0', { 1736 ['chromeos==0', {
1730 'sources/': [ 1737 'sources/': [
1731 ['exclude', '^browser/chromeos'], 1738 ['exclude', '^browser/chromeos'],
1732 ['exclude', '^browser/ui/webui/options/chromeos/'], 1739 ['exclude', '^browser/ui/webui/options/chromeos/'],
1733 ], 1740 ],
1734 'sources!': [ 1741 'sources!': [
1735 'browser/extensions/api/terminal/terminal_private_apitest.cc', 1742 'browser/extensions/api/terminal/terminal_private_apitest.cc',
1736 'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc', 1743 'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
1737 'test/data/webui/certificate_viewer_dialog_test.js', 1744 'test/data/webui/certificate_viewer_dialog_test.js',
1738 'test/data/webui/certificate_viewer_ui_test-inl.h', 1745 'test/data/webui/certificate_viewer_ui_test-inl.h',
(...skipping 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after
3222 'utility', 3229 'utility',
3223 ], 3230 ],
3224 'sources': [ 3231 'sources': [
3225 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3232 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3226 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3233 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3227 ], 3234 ],
3228 }] 3235 }]
3229 }], 3236 }],
3230 ], # 'conditions' 3237 ], # 'conditions'
3231 } 3238 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc ('k') | chrome/installer/linux/debian/expected_deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698