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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 285283003: Remove flag --test-sandbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes requested by jln Created 6 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
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 '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 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 'test/remoting/key_code_conv.h', 1585 'test/remoting/key_code_conv.h',
1586 'test/remoting/key_code_map.h', 1586 'test/remoting/key_code_map.h',
1587 'test/remoting/me2me_browsertest.cc', 1587 'test/remoting/me2me_browsertest.cc',
1588 'test/remoting/page_load_notification_observer.cc', 1588 'test/remoting/page_load_notification_observer.cc',
1589 'test/remoting/page_load_notification_observer.h', 1589 'test/remoting/page_load_notification_observer.h',
1590 'test/remoting/pin_browsertest.cc', 1590 'test/remoting/pin_browsertest.cc',
1591 'test/remoting/remote_desktop_browsertest.cc', 1591 'test/remoting/remote_desktop_browsertest.cc',
1592 'test/remoting/remote_desktop_browsertest.h', 1592 'test/remoting/remote_desktop_browsertest.h',
1593 'test/remoting/waiter.cc', 1593 'test/remoting/waiter.cc',
1594 'test/remoting/waiter.h', 1594 'test/remoting/waiter.h',
1595 'test/security_tests/sandbox_browsertest_linux.cc',
1596 'test/security_tests/sandbox_browsertest_win.cc',
1597 # TODO(craig): Rename this and run from base_unittests when the test 1595 # TODO(craig): Rename this and run from base_unittests when the test
1598 # is safe to run there. See http://crbug.com/78722 for details. 1596 # is safe to run there. See http://crbug.com/78722 for details.
1599 '../base/files/file_path_watcher_browsertest.cc', 1597 '../base/files/file_path_watcher_browsertest.cc',
1600 ], 1598 ],
1601 'rules': [ 1599 'rules': [
1602 { 1600 {
1603 'rule_name': 'js2webui', 1601 'rule_name': 'js2webui',
1604 'extension': 'js', 1602 'extension': 'js',
1605 'msvs_external_rule': 1, 1603 'msvs_external_rule': 1,
1606 'inputs': [ 1604 'inputs': [
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1815 ['OS=="win"', { 1813 ['OS=="win"', {
1816 'sources': [ 1814 'sources': [
1817 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1815 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
1818 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ', 1816 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
1819 ], 1817 ],
1820 'include_dirs': [ 1818 'include_dirs': [
1821 '<(DEPTH)/third_party/wtl/include', 1819 '<(DEPTH)/third_party/wtl/include',
1822 ], 1820 ],
1823 'dependencies': [ 1821 'dependencies': [
1824 'chrome_version_resources', 1822 'chrome_version_resources',
1825 'security_tests', # run time dependency
1826 ], 1823 ],
1827 'conditions': [ 1824 'conditions': [
1828 ['win_use_allocator_shim==1', { 1825 ['win_use_allocator_shim==1', {
1829 'dependencies': [ 1826 'dependencies': [
1830 '<(allocator_target)', 1827 '<(allocator_target)',
1831 ], 1828 ],
1832 }], 1829 }],
1833 ], 1830 ],
1834 }, { # else: OS != "win" 1831 }, { # else: OS != "win"
1835 'sources!': [ 1832 'sources!': [
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
2594 ], 2591 ],
2595 'include_dirs': [ 2592 'include_dirs': [
2596 '..,' 2593 '..,'
2597 ], 2594 ],
2598 }, 2595 },
2599 ], 2596 ],
2600 'conditions': [ 2597 'conditions': [
2601 ['OS=="mac"', { 2598 ['OS=="mac"', {
2602 'targets': [ 2599 'targets': [
2603 { 2600 {
2604 # This is the mac equivalent of the security_tests target below. It
2605 # generates a framework bundle which bundles tests to be run in a
2606 # renderer process. The test code is built as a framework so it can be
2607 # run in the context of a renderer without shipping the code to end
2608 # users.
2609 'target_name': 'renderer_sandbox_tests',
2610 'type': 'shared_library',
2611 'product_name': 'Renderer Sandbox Tests',
2612 'mac_bundle': 1,
2613 'xcode_settings': {
2614 'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist' ,
2615 },
2616 'sources': [
2617 'test/security_tests/renderer_sandbox_tests_mac.mm',
2618 ],
2619 'include_dirs': [
2620 '..',
2621 ],
2622 'link_settings': {
2623 'libraries': [
2624 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
2625 ],
2626 },
2627 }, # target renderer_sandbox_tests
2628 {
2629 # Tests for Mac app launcher. 2601 # Tests for Mac app launcher.
2630 'target_name': 'app_mode_app_tests', 2602 'target_name': 'app_mode_app_tests',
2631 'type': 'executable', 2603 'type': 'executable',
2632 'product_name': 'app_mode_app_tests', 2604 'product_name': 'app_mode_app_tests',
2633 'dependencies': [ 2605 'dependencies': [
2634 '../base/base.gyp:test_support_base', 2606 '../base/base.gyp:test_support_base',
2635 '../chrome/common_constants.gyp:common_constants', 2607 '../chrome/common_constants.gyp:common_constants',
2636 '../testing/gtest.gyp:gtest', 2608 '../testing/gtest.gyp:gtest',
2637 'chrome.gyp:chrome', # run time dependency 2609 'chrome.gyp:chrome', # run time dependency
2638 'app_mode_app_support', 2610 'app_mode_app_support',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
2717 }], 2689 }],
2718 ['OS=="linux" and enable_webrtc==1', { 2690 ['OS=="linux" and enable_webrtc==1', {
2719 'dependencies': [ 2691 'dependencies': [
2720 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 2692 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2721 ], 2693 ],
2722 }], 2694 }],
2723 ], 2695 ],
2724 }, 2696 },
2725 ], 2697 ],
2726 },], # OS!="mac" 2698 },], # OS!="mac"
2727 ['OS=="win"', {
2728 'targets': [
2729 {
2730 'target_name': 'security_tests',
2731 'type': 'shared_library',
2732 'include_dirs': [
2733 '..',
2734 ],
2735 'sources': [
2736 'test/security_tests/ipc_security_tests.cc',
2737 'test/security_tests/ipc_security_tests.h',
2738 'test/security_tests/security_tests.cc',
2739 '../sandbox/win/tests/validation_tests/commands.cc',
2740 '../sandbox/win/tests/validation_tests/commands.h',
2741 ],
2742 },
2743 ]}, # 'targets'
2744 ], # OS=="win"
2745 ['OS == "android"', { 2699 ['OS == "android"', {
2746 'targets': [ 2700 'targets': [
2747 { 2701 {
2748 'target_name': 'chrome_shell_test_apk', 2702 'target_name': 'chrome_shell_test_apk',
2749 'type': 'none', 2703 'type': 'none',
2750 'dependencies': [ 2704 'dependencies': [
2751 'chrome_java', 2705 'chrome_java',
2752 'chrome_shell_apk_java', 2706 'chrome_shell_apk_java',
2753 'chrome_java_test_support', 2707 'chrome_java_test_support',
2754 '../base/base.gyp:base', 2708 '../base/base.gyp:base',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
2992 ['enable_webrtc==1', { 2946 ['enable_webrtc==1', {
2993 'dependencies': [ 2947 'dependencies': [
2994 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2948 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2995 ] 2949 ]
2996 }], 2950 }],
2997 ], 2951 ],
2998 }] 2952 }]
2999 }], 2953 }],
3000 ], # 'conditions' 2954 ], # 'conditions'
3001 } 2955 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698