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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10692178: Revert revert of 146149 - Don't pass the connector check policy flag along. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test should not run on chromeos Created 8 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 | Annotate | Revision Log
OLDNEW
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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 2865 matching lines...) Expand 10 before | Expand all | Expand 10 after
2876 'browser/notifications/desktop_notifications_unittest.h', 2876 'browser/notifications/desktop_notifications_unittest.h',
2877 'browser/notifications/notification_browsertest.cc', 2877 'browser/notifications/notification_browsertest.cc',
2878 'browser/page_cycler/page_cycler_browsertest.cc', 2878 'browser/page_cycler/page_cycler_browsertest.cc',
2879 'browser/performance_monitor/performance_monitor_browsertest.cc', 2879 'browser/performance_monitor/performance_monitor_browsertest.cc',
2880 'browser/policy/device_management_service_browsertest.cc', 2880 'browser/policy/device_management_service_browsertest.cc',
2881 'browser/policy/policy_browsertest.cc', 2881 'browser/policy/policy_browsertest.cc',
2882 'browser/popup_blocker_browsertest.cc', 2882 'browser/popup_blocker_browsertest.cc',
2883 'browser/prefs/pref_service_browsertest.cc', 2883 'browser/prefs/pref_service_browsertest.cc',
2884 'browser/prerender/prefetch_browsertest.cc', 2884 'browser/prerender/prefetch_browsertest.cc',
2885 'browser/prerender/prerender_browsertest.cc', 2885 'browser/prerender/prerender_browsertest.cc',
2886 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
2886 'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest .cc', 2887 'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest .cc',
2887 'browser/printing/printing_layout_browsertest.cc', 2888 'browser/printing/printing_layout_browsertest.cc',
2888 'browser/printing/print_preview_tab_controller_browsertest.cc', 2889 'browser/printing/print_preview_tab_controller_browsertest.cc',
2889 'browser/process_singleton_browsertest.cc', 2890 'browser/process_singleton_browsertest.cc',
2890 'browser/profiles/profile_browsertest.cc', 2891 'browser/profiles/profile_browsertest.cc',
2891 'browser/profiles/profile_manager_browsertest.cc', 2892 'browser/profiles/profile_manager_browsertest.cc',
2892 'browser/protector/default_search_provider_change_browsertest.cc', 2893 'browser/protector/default_search_provider_change_browsertest.cc',
2893 'browser/protector/protector_service_browsertest.cc', 2894 'browser/protector/protector_service_browsertest.cc',
2894 'browser/repost_form_warning_browsertest.cc', 2895 'browser/repost_form_warning_browsertest.cc',
2895 'browser/rlz/rlz_extension_apitest.cc', 2896 'browser/rlz/rlz_extension_apitest.cc',
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
3138 'test/data/webui/certificate_viewer_dialog_test.js', 3139 'test/data/webui/certificate_viewer_dialog_test.js',
3139 'test/data/webui/certificate_viewer_ui_test-inl.h', 3140 'test/data/webui/certificate_viewer_ui_test-inl.h',
3140 ], 3141 ],
3141 }, { #else: OS == "chromeos" 3142 }, { #else: OS == "chromeos"
3142 'sources/': [ 3143 'sources/': [
3143 # Protector is disabled on CrOS. 3144 # Protector is disabled on CrOS.
3144 ['exclude', '^browser/protector'], 3145 ['exclude', '^browser/protector'],
3145 ], 3146 ],
3146 'sources!': [ 3147 'sources!': [
3147 'browser/notifications/desktop_notifications_unittest.cc', 3148 'browser/notifications/desktop_notifications_unittest.cc',
3149 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc ',
3148 'browser/printing/cloud_print/test/cloud_print_proxy_process_browser test.cc', 3150 'browser/printing/cloud_print/test/cloud_print_proxy_process_browser test.cc',
3149 'browser/service/service_process_control_browsertest.cc', 3151 'browser/service/service_process_control_browsertest.cc',
3150 # chromeos does not use cross-platform panels 3152 # chromeos does not use cross-platform panels
3151 'browser/ui/panels/panel_view_browsertest.cc', 3153 'browser/ui/panels/panel_view_browsertest.cc',
3152 ], 3154 ],
3153 'dependencies': [ 3155 'dependencies': [
3154 '../dbus/dbus.gyp:dbus_test_support', 3156 '../dbus/dbus.gyp:dbus_test_support',
3155 '../build/linux/system.gyp:dbus', 3157 '../build/linux/system.gyp:dbus',
3156 ], 3158 ],
3157 }], 3159 }],
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
3295 'sources': [ 3297 'sources': [
3296 'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc', 3298 'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
3297 '../content/renderer/external_popup_menu_browsertest.cc', 3299 '../content/renderer/external_popup_menu_browsertest.cc',
3298 ], 3300 ],
3299 'sources!': [ 3301 'sources!': [
3300 # TODO(hbono): This test depends on hunspell and we cannot run it on 3302 # TODO(hbono): This test depends on hunspell and we cannot run it on
3301 # Mac, which does not use hunspell by default. 3303 # Mac, which does not use hunspell by default.
3302 'browser/spellchecker/spellcheck_host_browsertest.cc', 3304 'browser/spellchecker/spellcheck_host_browsertest.cc',
3303 # ProcessSingletonMac doesn't do anything. 3305 # ProcessSingletonMac doesn't do anything.
3304 'browser/process_singleton_browsertest.cc', 3306 'browser/process_singleton_browsertest.cc',
3307 # This test depends on GetCommandLineForRelaunch, which is not
3308 # available on Mac.
3309 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc ',
3305 ], 3310 ],
3306 }], 3311 }],
3307 ['os_posix == 0 or chromeos == 1', { 3312 ['os_posix == 0 or chromeos == 1', {
3308 'sources!': [ 3313 'sources!': [
3309 'common/time_format_browsertest.cc', 3314 'common/time_format_browsertest.cc',
3310 ], 3315 ],
3311 }], 3316 }],
3312 ['os_posix == 1 and OS != "mac" and OS != "android"', { 3317 ['os_posix == 1 and OS != "mac" and OS != "android"', {
3313 'conditions': [ 3318 'conditions': [
3314 ['linux_use_tcmalloc==1', { 3319 ['linux_use_tcmalloc==1', {
(...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
4682 'input_jars_paths': [ 4687 'input_jars_paths': [
4683 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4688 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4684 ], 4689 ],
4685 }, 4690 },
4686 'includes': [ '../build/apk_test.gypi' ], 4691 'includes': [ '../build/apk_test.gypi' ],
4687 }, 4692 },
4688 ], 4693 ],
4689 }], 4694 }],
4690 ], # 'conditions' 4695 ], # 'conditions'
4691 } 4696 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc ('k') | chrome/common/chrome_result_codes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698