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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 7054041: Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_common.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 { 5 {
6 'variables' : { 6 'variables' : {
7 'pyautolib_sources': [ 7 'pyautolib_sources': [
8 'app/chrome_command_ids.h', 8 'app/chrome_command_ids.h',
9 'app/chrome_dll_resource.h', 9 'app/chrome_dll_resource.h',
10 'common/automation_constants.h', 10 'common/automation_constants.h',
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 ], 208 ],
209 'conditions': [ 209 'conditions': [
210 ['chromeos==0', { 210 ['chromeos==0', {
211 'sources/': [ 211 'sources/': [
212 ['exclude', '^browser/chromeos'], 212 ['exclude', '^browser/chromeos'],
213 ], 213 ],
214 }], 214 }],
215 ['toolkit_uses_gtk == 1', { 215 ['toolkit_uses_gtk == 1', {
216 'dependencies': [ 216 'dependencies': [
217 '../build/linux/system.gyp:gtk', 217 '../build/linux/system.gyp:gtk',
218 '../build/linux/system.gyp:ssl', 218 '../build/linux/system.gyp:nss',
219 ], 219 ],
220 }], 220 }],
221 ['OS=="win"', { 221 ['OS=="win"', {
222 'include_dirs': [ 222 'include_dirs': [
223 '<(DEPTH)/third_party/wtl/include', 223 '<(DEPTH)/third_party/wtl/include',
224 ], 224 ],
225 }], 225 }],
226 ], 226 ],
227 }, 227 },
228 { 228 {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 'test/interactive_ui/npapi_interactive_test.cc', 469 'test/interactive_ui/npapi_interactive_test.cc',
470 'test/interactive_ui/view_event_test_base.cc', 470 'test/interactive_ui/view_event_test_base.cc',
471 'test/interactive_ui/view_event_test_base.h', 471 'test/interactive_ui/view_event_test_base.h',
472 'test/out_of_proc_test_runner.cc', 472 'test/out_of_proc_test_runner.cc',
473 'test/unit/chrome_test_suite.h', 473 'test/unit/chrome_test_suite.h',
474 ], 474 ],
475 'conditions': [ 475 'conditions': [
476 ['toolkit_uses_gtk == 1', { 476 ['toolkit_uses_gtk == 1', {
477 'dependencies': [ 477 'dependencies': [
478 '../build/linux/system.gyp:gtk', 478 '../build/linux/system.gyp:gtk',
479 '../build/linux/system.gyp:ssl', 479 '../build/linux/system.gyp:nss',
480 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 480 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
481 ], 481 ],
482 }], 482 }],
483 ['toolkit_uses_gtk == 1 and toolkit_views == 0', { 483 ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
484 'sources!': [ 484 'sources!': [
485 # TODO(port) 485 # TODO(port)
486 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', 486 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
487 'browser/ui/views/find_bar_host_interactive_uitest.cc', 487 'browser/ui/views/find_bar_host_interactive_uitest.cc',
488 'browser/ui/views/menu_item_view_test.cc', 488 'browser/ui/views/menu_item_view_test.cc',
489 'browser/ui/views/tabs/tab_dragging_test.cc', 489 'browser/ui/views/tabs/tab_dragging_test.cc',
(...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
2020 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', 2020 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
2021 'browser/ui/gtk/gtk_expanded_container_unittest.cc', 2021 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
2022 'browser/ui/gtk/gtk_theme_service_unittest.cc', 2022 'browser/ui/gtk/gtk_theme_service_unittest.cc',
2023 'browser/ui/gtk/reload_button_gtk_unittest.cc', 2023 'browser/ui/gtk/reload_button_gtk_unittest.cc',
2024 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc', 2024 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
2025 ], 2025 ],
2026 }], 2026 }],
2027 ], 2027 ],
2028 'dependencies': [ 2028 'dependencies': [
2029 '../build/linux/system.gyp:gtk', 2029 '../build/linux/system.gyp:gtk',
2030 '../build/linux/system.gyp:ssl', 2030 '../build/linux/system.gyp:nss',
2031 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2031 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2032 ], 2032 ],
2033 'sources!': [ 2033 'sources!': [
2034 'browser/printing/print_job_unittest.cc', 2034 'browser/printing/print_job_unittest.cc',
2035 ], 2035 ],
2036 }, { # else: toolkit_uses_gtk != 1 2036 }, { # else: toolkit_uses_gtk != 1
2037 'sources!': [ 2037 'sources!': [
2038 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', 2038 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
2039 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', 2039 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
2040 '../views/focus/accelerator_handler_gtk_unittest.cc', 2040 '../views/focus/accelerator_handler_gtk_unittest.cc',
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
2564 'app/chrome_dll_version.rc.version', 2564 'app/chrome_dll_version.rc.version',
2565 'browser/extensions/extension_rlz_apitest.cc', 2565 'browser/extensions/extension_rlz_apitest.cc',
2566 # http://crbug.com/15101 These tests fail on Linux and Mac. 2566 # http://crbug.com/15101 These tests fail on Linux and Mac.
2567 'browser/renderer_host/web_cache_manager_browsertest.cc', 2567 'browser/renderer_host/web_cache_manager_browsertest.cc',
2568 '../content/browser/child_process_security_policy_browsertest.cc', 2568 '../content/browser/child_process_security_policy_browsertest.cc',
2569 ], 2569 ],
2570 }], 2570 }],
2571 ['toolkit_uses_gtk == 1', { 2571 ['toolkit_uses_gtk == 1', {
2572 'dependencies': [ 2572 'dependencies': [
2573 '../build/linux/system.gyp:gtk', 2573 '../build/linux/system.gyp:gtk',
2574 '../build/linux/system.gyp:ssl', 2574 '../build/linux/system.gyp:nss',
2575 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2575 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2576 ], 2576 ],
2577 'sources': [ 2577 'sources': [
2578 # TODO(estade): port to win/mac. 2578 # TODO(estade): port to win/mac.
2579 'browser/ui/webui/constrained_html_ui_browsertest.cc', 2579 'browser/ui/webui/constrained_html_ui_browsertest.cc',
2580 ], 2580 ],
2581 }], 2581 }],
2582 ['OS=="mac"', { 2582 ['OS=="mac"', {
2583 'include_dirs': [ 2583 'include_dirs': [
2584 '../third_party/GTM', 2584 '../third_party/GTM',
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
3205 }, 3205 },
3206 }, 3206 },
3207 }, { # else: OS != "win" 3207 }, { # else: OS != "win"
3208 'sources!': [ 3208 'sources!': [
3209 'browser/sync/util/data_encryption_unittest.cc', 3209 'browser/sync/util/data_encryption_unittest.cc',
3210 ], 3210 ],
3211 }], 3211 }],
3212 ['toolkit_uses_gtk == 1', { 3212 ['toolkit_uses_gtk == 1', {
3213 'dependencies': [ 3213 'dependencies': [
3214 '../build/linux/system.gyp:gtk', 3214 '../build/linux/system.gyp:gtk',
3215 '../build/linux/system.gyp:ssl', 3215 '../build/linux/system.gyp:nss',
3216 'packed_resources' 3216 'packed_resources'
3217 ], 3217 ],
3218 }], 3218 }],
3219 ['OS=="mac"', { 3219 ['OS=="mac"', {
3220 # See the comment in this section of the unit_tests target for an 3220 # See the comment in this section of the unit_tests target for an
3221 # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 3221 # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
3222 'dependencies+++': [ 3222 'dependencies+++': [
3223 '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcor e', 3223 '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcor e',
3224 ], 3224 ],
3225 'dependencies': [ 3225 'dependencies': [
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
3329 'test/test_notification_tracker.h', 3329 'test/test_notification_tracker.h',
3330 'test/ui_test_utils_linux.cc', 3330 'test/ui_test_utils_linux.cc',
3331 'test/ui_test_utils_mac.mm', 3331 'test/ui_test_utils_mac.mm',
3332 'test/ui_test_utils_win.cc', 3332 'test/ui_test_utils_win.cc',
3333 'test/data/resource.rc', 3333 'test/data/resource.rc',
3334 ], 3334 ],
3335 'conditions': [ 3335 'conditions': [
3336 ['toolkit_uses_gtk == 1', { 3336 ['toolkit_uses_gtk == 1', {
3337 'dependencies': [ 3337 'dependencies': [
3338 '../build/linux/system.gyp:gtk', 3338 '../build/linux/system.gyp:gtk',
3339 '../build/linux/system.gyp:ssl', 3339 '../build/linux/system.gyp:nss',
3340 ], 3340 ],
3341 }], 3341 }],
3342 ['OS=="mac"', { 3342 ['OS=="mac"', {
3343 # See the comment in this section of the unit_tests target for an 3343 # See the comment in this section of the unit_tests target for an
3344 # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 3344 # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
3345 'dependencies+++': [ 3345 'dependencies+++': [
3346 '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcor e', 3346 '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcor e',
3347 ], 3347 ],
3348 # The sync_integration_tests do not run on mac without this flag. 3348 # The sync_integration_tests do not run on mac without this flag.
3349 # Search for comments about "xcode_settings" elsewhere in this file. 3349 # Search for comments about "xcode_settings" elsewhere in this file.
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
3477 # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 3477 # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
3478 'dependencies+++': [ 3478 'dependencies+++': [
3479 '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcor e', 3479 '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcor e',
3480 ], 3480 ],
3481 # See comments about "xcode_settings" elsewhere in this file. 3481 # See comments about "xcode_settings" elsewhere in this file.
3482 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 3482 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
3483 }], 3483 }],
3484 ['toolkit_uses_gtk == 1', { 3484 ['toolkit_uses_gtk == 1', {
3485 'dependencies': [ 3485 'dependencies': [
3486 '../build/linux/system.gyp:gtk', 3486 '../build/linux/system.gyp:gtk',
3487 '../build/linux/system.gyp:ssl', 3487 '../build/linux/system.gyp:nss',
3488 ], 3488 ],
3489 }], 3489 }],
3490 ['toolkit_views==1', { 3490 ['toolkit_views==1', {
3491 'dependencies': [ 3491 'dependencies': [
3492 '../views/views.gyp:views', 3492 '../views/views.gyp:views',
3493 ], 3493 ],
3494 }], 3494 }],
3495 ], 3495 ],
3496 }, 3496 },
3497 # { 3497 # {
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
4054 ] 4054 ]
4055 }], # 'coverage!=0' 4055 }], # 'coverage!=0'
4056 ], # 'conditions' 4056 ], # 'conditions'
4057 } 4057 }
4058 4058
4059 # Local Variables: 4059 # Local Variables:
4060 # tab-width:2 4060 # tab-width:2
4061 # indent-tabs-mode:nil 4061 # indent-tabs-mode:nil
4062 # End: 4062 # End:
4063 # vim: set expandtab tabstop=2 shiftwidth=2: 4063 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698