| OLD | NEW |
| 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 'includes': [ | 5 'includes': [ |
| 6 'js_unittest_vars.gypi', | 6 'js_unittest_vars.gypi', |
| 7 ], | 7 ], |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'interactive_ui_tests', | 10 'target_name': 'interactive_ui_tests', |
| (...skipping 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1552 'test/remoting/key_code_conv.h', | 1552 'test/remoting/key_code_conv.h', |
| 1553 'test/remoting/key_code_map.h', | 1553 'test/remoting/key_code_map.h', |
| 1554 'test/remoting/me2me_browsertest.cc', | 1554 'test/remoting/me2me_browsertest.cc', |
| 1555 'test/remoting/page_load_notification_observer.cc', | 1555 'test/remoting/page_load_notification_observer.cc', |
| 1556 'test/remoting/page_load_notification_observer.h', | 1556 'test/remoting/page_load_notification_observer.h', |
| 1557 'test/remoting/pin_browsertest.cc', | 1557 'test/remoting/pin_browsertest.cc', |
| 1558 'test/remoting/remote_desktop_browsertest.cc', | 1558 'test/remoting/remote_desktop_browsertest.cc', |
| 1559 'test/remoting/remote_desktop_browsertest.h', | 1559 'test/remoting/remote_desktop_browsertest.h', |
| 1560 'test/remoting/waiter.cc', | 1560 'test/remoting/waiter.cc', |
| 1561 'test/remoting/waiter.h', | 1561 'test/remoting/waiter.h', |
| 1562 'test/security_tests/sandbox_browsertest_linux.cc', | |
| 1563 'test/security_tests/sandbox_browsertest_win.cc', | |
| 1564 # TODO(craig): Rename this and run from base_unittests when the test | 1562 # TODO(craig): Rename this and run from base_unittests when the test |
| 1565 # is safe to run there. See http://crbug.com/78722 for details. | 1563 # is safe to run there. See http://crbug.com/78722 for details. |
| 1566 '../base/files/file_path_watcher_browsertest.cc', | 1564 '../base/files/file_path_watcher_browsertest.cc', |
| 1567 ], | 1565 ], |
| 1568 'rules': [ | 1566 'rules': [ |
| 1569 { | 1567 { |
| 1570 'rule_name': 'js2webui', | 1568 'rule_name': 'js2webui', |
| 1571 'extension': 'js', | 1569 'extension': 'js', |
| 1572 'msvs_external_rule': 1, | 1570 'msvs_external_rule': 1, |
| 1573 'inputs': [ | 1571 'inputs': [ |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1787 'sources': [ | 1785 'sources': [ |
| 1788 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', | 1786 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
| 1789 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc
', | 1787 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc
', |
| 1790 ], | 1788 ], |
| 1791 'include_dirs': [ | 1789 'include_dirs': [ |
| 1792 '<(DEPTH)/third_party/wtl/include', | 1790 '<(DEPTH)/third_party/wtl/include', |
| 1793 ], | 1791 ], |
| 1794 'dependencies': [ | 1792 'dependencies': [ |
| 1795 'browser_tests_exe_pdb_workaround', | 1793 'browser_tests_exe_pdb_workaround', |
| 1796 'chrome_version_resources', | 1794 'chrome_version_resources', |
| 1797 'security_tests', # run time dependency | |
| 1798 ], | 1795 ], |
| 1799 'conditions': [ | 1796 'conditions': [ |
| 1800 ['win_use_allocator_shim==1', { | 1797 ['win_use_allocator_shim==1', { |
| 1801 'dependencies': [ | 1798 'dependencies': [ |
| 1802 '<(allocator_target)', | 1799 '<(allocator_target)', |
| 1803 ], | 1800 ], |
| 1804 }], | 1801 }], |
| 1805 ], | 1802 ], |
| 1806 'sources!': [ | 1803 'sources!': [ |
| 1807 # use_aura currently sets use_ash on Windows. So take these tests ou
t | 1804 # use_aura currently sets use_ash on Windows. So take these tests ou
t |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2564 ], | 2561 ], |
| 2565 'include_dirs': [ | 2562 'include_dirs': [ |
| 2566 '..,' | 2563 '..,' |
| 2567 ], | 2564 ], |
| 2568 }, | 2565 }, |
| 2569 ], | 2566 ], |
| 2570 'conditions': [ | 2567 'conditions': [ |
| 2571 ['OS=="mac"', { | 2568 ['OS=="mac"', { |
| 2572 'targets': [ | 2569 'targets': [ |
| 2573 { | 2570 { |
| 2574 # This is the mac equivalent of the security_tests target below. It | |
| 2575 # generates a framework bundle which bundles tests to be run in a | |
| 2576 # renderer process. The test code is built as a framework so it can be | |
| 2577 # run in the context of a renderer without shipping the code to end | |
| 2578 # users. | |
| 2579 'target_name': 'renderer_sandbox_tests', | |
| 2580 'type': 'shared_library', | |
| 2581 'product_name': 'Renderer Sandbox Tests', | |
| 2582 'mac_bundle': 1, | |
| 2583 'xcode_settings': { | |
| 2584 'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist'
, | |
| 2585 }, | |
| 2586 'sources': [ | |
| 2587 'test/security_tests/renderer_sandbox_tests_mac.mm', | |
| 2588 ], | |
| 2589 'include_dirs': [ | |
| 2590 '..', | |
| 2591 ], | |
| 2592 'link_settings': { | |
| 2593 'libraries': [ | |
| 2594 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', | |
| 2595 ], | |
| 2596 }, | |
| 2597 }, # target renderer_sandbox_tests | |
| 2598 { | |
| 2599 # Tests for Mac app launcher. | 2571 # Tests for Mac app launcher. |
| 2600 'target_name': 'app_mode_app_tests', | 2572 'target_name': 'app_mode_app_tests', |
| 2601 'type': 'executable', | 2573 'type': 'executable', |
| 2602 'product_name': 'app_mode_app_tests', | 2574 'product_name': 'app_mode_app_tests', |
| 2603 'dependencies': [ | 2575 'dependencies': [ |
| 2604 '../base/base.gyp:test_support_base', | 2576 '../base/base.gyp:test_support_base', |
| 2605 '../chrome/common_constants.gyp:common_constants', | 2577 '../chrome/common_constants.gyp:common_constants', |
| 2606 '../testing/gtest.gyp:gtest', | 2578 '../testing/gtest.gyp:gtest', |
| 2607 'chrome.gyp:chrome', # run time dependency | 2579 'chrome.gyp:chrome', # run time dependency |
| 2608 'app_mode_app_support', | 2580 'app_mode_app_support', |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2687 }], | 2659 }], |
| 2688 ['OS=="linux" and enable_webrtc==1', { | 2660 ['OS=="linux" and enable_webrtc==1', { |
| 2689 'dependencies': [ | 2661 'dependencies': [ |
| 2690 '../third_party/libjingle/libjingle.gyp:libpeerconnection', | 2662 '../third_party/libjingle/libjingle.gyp:libpeerconnection', |
| 2691 ], | 2663 ], |
| 2692 }], | 2664 }], |
| 2693 ], | 2665 ], |
| 2694 }, | 2666 }, |
| 2695 ], | 2667 ], |
| 2696 },], # OS!="mac" | 2668 },], # OS!="mac" |
| 2697 ['OS=="win"', { | |
| 2698 'targets': [ | |
| 2699 { | |
| 2700 'target_name': 'security_tests', | |
| 2701 'type': 'shared_library', | |
| 2702 'include_dirs': [ | |
| 2703 '..', | |
| 2704 ], | |
| 2705 'sources': [ | |
| 2706 'test/security_tests/ipc_security_tests.cc', | |
| 2707 'test/security_tests/ipc_security_tests.h', | |
| 2708 'test/security_tests/security_tests.cc', | |
| 2709 '../sandbox/win/tests/validation_tests/commands.cc', | |
| 2710 '../sandbox/win/tests/validation_tests/commands.h', | |
| 2711 ], | |
| 2712 }, | |
| 2713 ]}, # 'targets' | |
| 2714 ], # OS=="win" | |
| 2715 ['OS == "android"', { | 2669 ['OS == "android"', { |
| 2716 'targets': [ | 2670 'targets': [ |
| 2717 { | 2671 { |
| 2718 'target_name': 'chrome_shell_test_apk', | 2672 'target_name': 'chrome_shell_test_apk', |
| 2719 'type': 'none', | 2673 'type': 'none', |
| 2720 'dependencies': [ | 2674 'dependencies': [ |
| 2721 'chrome_java', | 2675 'chrome_java', |
| 2722 'chrome_shell_apk_java', | 2676 'chrome_shell_apk_java', |
| 2723 'chrome_java_test_support', | 2677 'chrome_java_test_support', |
| 2724 '../base/base.gyp:base', | 2678 '../base/base.gyp:base', |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2967 ['enable_webrtc==1', { | 2921 ['enable_webrtc==1', { |
| 2968 'dependencies': [ | 2922 'dependencies': [ |
| 2969 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 2923 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2970 ] | 2924 ] |
| 2971 }], | 2925 }], |
| 2972 ], | 2926 ], |
| 2973 }] | 2927 }] |
| 2974 }], | 2928 }], |
| 2975 ], # 'conditions' | 2929 ], # 'conditions' |
| 2976 } | 2930 } |
| OLD | NEW |