| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'test_shell_windows_resource_files': [ | 7 'test_shell_windows_resource_files': [ |
| 8 'resources/test_shell.rc', | 8 'resources/test_shell.rc', |
| 9 '../../glue/resources/pan_east.cur', | 9 '../../glue/resources/pan_east.cur', |
| 10 '../../glue/resources/pan_middle.cur', | 10 '../../glue/resources/pan_middle.cur', |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 # TODO(mark): Come up with a fancier way to do this (mac_info_plist?) | 234 # TODO(mark): Come up with a fancier way to do this (mac_info_plist?) |
| 235 # that automatically sets the correct INFOPLIST_FILE setting and adds | 235 # that automatically sets the correct INFOPLIST_FILE setting and adds |
| 236 # the file to a source group. | 236 # the file to a source group. |
| 237 'mac/Info.plist', | 237 'mac/Info.plist', |
| 238 ], | 238 ], |
| 239 'xcode_settings': { | 239 'xcode_settings': { |
| 240 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/test_shell/mac/Info.plist', | 240 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/test_shell/mac/Info.plist', |
| 241 }, | 241 }, |
| 242 'conditions': [ | 242 'conditions': [ |
| 243 ['OS=="win"', { | 243 ['OS=="win"', { |
| 244 'dependencies': [ | |
| 245 'layout_test_helper', | |
| 246 ], | |
| 247 'resource_include_dirs': [ | 244 'resource_include_dirs': [ |
| 248 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 245 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 249 ], | 246 ], |
| 250 'sources': [ | 247 'sources': [ |
| 251 '<@(test_shell_windows_resource_files)', | 248 '<@(test_shell_windows_resource_files)', |
| 252 # TODO: It would be nice to have these pulled in | 249 # TODO: It would be nice to have these pulled in |
| 253 # automatically from direct_dependent_settings in | 250 # automatically from direct_dependent_settings in |
| 254 # their various targets (net.gyp:net_resources, etc.), | 251 # their various targets (net.gyp:net_resources, etc.), |
| 255 # but that causes errors in other targets when | 252 # but that causes errors in other targets when |
| 256 # resulting .res files get referenced multiple times. | 253 # resulting .res files get referenced multiple times. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 279 ], | 276 ], |
| 280 'dependencies': [ | 277 'dependencies': [ |
| 281 '<(DEPTH)/build/linux/system.gyp:gtk', | 278 '<(DEPTH)/build/linux/system.gyp:gtk', |
| 282 'test_shell_resources', | 279 'test_shell_resources', |
| 283 'test_shell_pak', | 280 'test_shell_pak', |
| 284 ], | 281 ], |
| 285 }], | 282 }], |
| 286 ['OS=="mac"', { | 283 ['OS=="mac"', { |
| 287 'product_name': 'TestShell', | 284 'product_name': 'TestShell', |
| 288 'dependencies': [ | 285 'dependencies': [ |
| 289 'layout_test_helper', | |
| 290 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', | 286 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', |
| 291 ], | 287 ], |
| 292 'variables': { | 288 'variables': { |
| 293 'repack_path': '../../../tools/grit/grit/format/repack.py', | 289 'repack_path': '../../../tools/grit/grit/format/repack.py', |
| 294 }, | 290 }, |
| 295 'actions': [ | 291 'actions': [ |
| 296 { | 292 { |
| 297 # TODO(mark): Make this work with more languages than the | 293 # TODO(mark): Make this work with more languages than the |
| 298 # hardcoded en-US. | 294 # hardcoded en-US. |
| 299 'action_name': 'repack_locale', | 295 'action_name': 'repack_locale', |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 'actions': [ | 633 'actions': [ |
| 638 { | 634 { |
| 639 'action_name': 'test_shell_resources', | 635 'action_name': 'test_shell_resources', |
| 640 'includes': [ '../../../build/grit_action.gypi' ], | 636 'includes': [ '../../../build/grit_action.gypi' ], |
| 641 }, | 637 }, |
| 642 ], | 638 ], |
| 643 'includes': [ '../../../build/grit_target.gypi' ], | 639 'includes': [ '../../../build/grit_target.gypi' ], |
| 644 }, | 640 }, |
| 645 ], | 641 ], |
| 646 }], | 642 }], |
| 647 ['OS=="win"', { | |
| 648 'targets': [ | |
| 649 { | |
| 650 # Helper application that disables ClearType during the | |
| 651 # running of the layout tests | |
| 652 'target_name': 'layout_test_helper', | |
| 653 'type': 'executable', | |
| 654 'variables': { | |
| 655 'chromium_code': 1, | |
| 656 }, | |
| 657 'sources': [ | |
| 658 'win/layout_test_helper.cc', | |
| 659 ], | |
| 660 }, | |
| 661 ], | |
| 662 }], | |
| 663 ['OS=="mac"', { | |
| 664 'targets': [ | |
| 665 { | |
| 666 # Helper application that manages the color sync profile on mac | |
| 667 # for the test shells run by the layout tests. | |
| 668 'target_name': 'layout_test_helper', | |
| 669 'type': 'executable', | |
| 670 'variables': { | |
| 671 'chromium_code': 1, | |
| 672 }, | |
| 673 'sources': [ | |
| 674 'mac/layout_test_helper.mm', | |
| 675 ], | |
| 676 'link_settings': { | |
| 677 'libraries': [ | |
| 678 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', | |
| 679 ], | |
| 680 }, | |
| 681 }, | |
| 682 ], | |
| 683 }], | |
| 684 ], | 643 ], |
| 685 } | 644 } |
| OLD | NEW |