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

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

Powered by Google App Engine
This is Rietveld 408576698