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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1259883007: Remove the Finch test 'CLD1VsCLD2' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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/chrome_shell.gypi ('k') | chrome/chrome_tests_unit.gypi » ('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 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1566 '..', 1566 '..',
1567 ], 1567 ],
1568 'defines': [ 1568 'defines': [
1569 'HAS_OUT_OF_PROC_TEST_RUNNER', 1569 'HAS_OUT_OF_PROC_TEST_RUNNER',
1570 ], 1570 ],
1571 'sources': [ 1571 'sources': [
1572 '<@(chrome_interactive_ui_test_extensions_sources)', 1572 '<@(chrome_interactive_ui_test_extensions_sources)',
1573 '<@(chrome_interactive_ui_test_sources)', 1573 '<@(chrome_interactive_ui_test_sources)',
1574 ], 1574 ],
1575 'conditions': [ 1575 'conditions': [
1576 [ 'cld_version==0 or cld_version==2', { 1576 [ 'cld_version==2', {
1577 'dependencies': [ 1577 'dependencies': [
1578 # Interactive tests should use whatever CLD2 data access mode that 1578 # Interactive tests should use whatever CLD2 data access mode that
1579 # the application embedder is using. 1579 # the application embedder is using.
1580 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], 1580 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
1581 }], 1581 }],
1582 ['use_x11==1', { 1582 ['use_x11==1', {
1583 'dependencies': [ 1583 'dependencies': [
1584 '../build/linux/system.gyp:xtst', 1584 '../build/linux/system.gyp:xtst',
1585 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1585 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1586 ], 1586 ],
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 'msvs_settings': { 2132 'msvs_settings': {
2133 'VCLinkerTool': { 2133 'VCLinkerTool': {
2134 'conditions': [ 2134 'conditions': [
2135 ['incremental_chrome_dll==1', { 2135 ['incremental_chrome_dll==1', {
2136 'UseLibraryDependencyInputs': "true", 2136 'UseLibraryDependencyInputs': "true",
2137 }], 2137 }],
2138 ], 2138 ],
2139 }, 2139 },
2140 }, 2140 },
2141 'conditions': [ 2141 'conditions': [
2142 [ 'cld_version==0 or cld_version==2', { 2142 [ 'cld_version==2', {
2143 'dependencies': [ 2143 'dependencies': [
2144 # Because the browser_tests use translate, they need CLD data. 2144 # Because the browser_tests use translate, they need CLD data.
2145 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], 2145 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
2146 }], 2146 }],
2147 ['enable_one_click_signin==0', { 2147 ['enable_one_click_signin==0', {
2148 'sources!': [ 2148 'sources!': [
2149 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest. cc', 2149 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest. cc',
2150 ] 2150 ]
2151 }], 2151 }],
2152 ['enable_autofill_dialog==0', { 2152 ['enable_autofill_dialog==0', {
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
2605 '<@(_inputs)', 2605 '<@(_inputs)',
2606 'webui', 2606 'webui',
2607 '--external', '<(external_v8)', 2607 '--external', '<(external_v8)',
2608 '<(RULE_INPUT_PATH)', 2608 '<(RULE_INPUT_PATH)',
2609 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', 2609 'chrome/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js',
2610 '<@(_outputs)', 2610 '<@(_outputs)',
2611 ], 2611 ],
2612 }, 2612 },
2613 ], 2613 ],
2614 'conditions': [ 2614 'conditions': [
2615 [ 'cld_version==0 or cld_version==2', { 2615 [ 'cld_version==2', {
2616 'dependencies': [ 2616 'dependencies': [
2617 # Interactive tests should use whatever CLD2 data access mode that 2617 # Interactive tests should use whatever CLD2 data access mode that
2618 # the application embedder is using. 2618 # the application embedder is using.
2619 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], 2619 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
2620 }], 2620 }],
2621 ['OS=="win"', { 2621 ['OS=="win"', {
2622 'sources': [ 2622 'sources': [
2623 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2623 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2624 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 2624 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
2625 ], 2625 ],
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2792 '<(protoc_out_dir)', 2792 '<(protoc_out_dir)',
2793 ], 2793 ],
2794 # TODO(phajdan.jr): Only temporary, to make transition easier. 2794 # TODO(phajdan.jr): Only temporary, to make transition easier.
2795 'defines': [ 2795 'defines': [
2796 'HAS_OUT_OF_PROC_TEST_RUNNER', 2796 'HAS_OUT_OF_PROC_TEST_RUNNER',
2797 ], 2797 ],
2798 'sources': [ 2798 'sources': [
2799 '<@(sync_integration_tests_sources)', 2799 '<@(sync_integration_tests_sources)',
2800 ], 2800 ],
2801 'conditions': [ 2801 'conditions': [
2802 [ 'cld_version==0 or cld_version==2', { 2802 [ 'cld_version==2', {
2803 'dependencies': [ 2803 'dependencies': [
2804 # Language detection is irrelevant to sync, so it can depend on 2804 # Language detection is irrelevant to sync, so it can depend on
2805 # any implementation for CLD2. Dynamic is smaller, so go with 2805 # any implementation for CLD2. Dynamic is smaller, so go with
2806 # dynamic. 2806 # dynamic.
2807 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ], 2807 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
2808 }], 2808 }],
2809 ['OS=="linux"', { 2809 ['OS=="linux"', {
2810 'dependencies': [ 2810 'dependencies': [
2811 '../build/linux/system.gyp:ssl', 2811 '../build/linux/system.gyp:ssl',
2812 ], 2812 ],
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
2902 '<(INTERMEDIATE_DIR)', 2902 '<(INTERMEDIATE_DIR)',
2903 '<(protoc_out_dir)', 2903 '<(protoc_out_dir)',
2904 ], 2904 ],
2905 'defines': [ 2905 'defines': [
2906 'HAS_OUT_OF_PROC_TEST_RUNNER', 2906 'HAS_OUT_OF_PROC_TEST_RUNNER',
2907 ], 2907 ],
2908 'sources': [ 2908 'sources': [
2909 '<@(sync_performance_tests_sources)', 2909 '<@(sync_performance_tests_sources)',
2910 ], 2910 ],
2911 'conditions': [ 2911 'conditions': [
2912 [ 'cld_version==0 or cld_version==2', { 2912 [ 'cld_version==2', {
2913 'dependencies': [ 2913 'dependencies': [
2914 # Language detection is irrelevant to sync, so it can depend on 2914 # Language detection is irrelevant to sync, so it can depend on
2915 # any implementation for CLD2. Dynamic is smaller, so go with 2915 # any implementation for CLD2. Dynamic is smaller, so go with
2916 # dynamic. 2916 # dynamic.
2917 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ], 2917 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
2918 }], 2918 }],
2919 ['OS=="linux"', { 2919 ['OS=="linux"', {
2920 'dependencies': [ 2920 'dependencies': [
2921 '../build/linux/system.gyp:ssl', 2921 '../build/linux/system.gyp:ssl',
2922 ], 2922 ],
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
3373 'utility', 3373 'utility',
3374 ], 3374 ],
3375 'sources': [ 3375 'sources': [
3376 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3376 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3377 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3377 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3378 ], 3378 ],
3379 }] 3379 }]
3380 }], 3380 }],
3381 ], # 'conditions' 3381 ], # 'conditions'
3382 } 3382 }
OLDNEW
« no previous file with comments | « chrome/chrome_shell.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698