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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 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 '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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 # Although this one is probably safe to ignore. 512 # Although this one is probably safe to ignore.
513 # Mongose casts -1 directly as HANDLE (definitely safe to ignore). 513 # Mongose casts -1 directly as HANDLE (definitely safe to ignore).
514 'msvs_disabled_warnings': [4267, 4306, ], 514 'msvs_disabled_warnings': [4267, 4306, ],
515 }, 515 },
516 { 516 {
517 # chromedriver is the chromium implementation of WebDriver. 517 # chromedriver is the chromium implementation of WebDriver.
518 # See http://www.chromium.org/developers/testing/webdriver-for-chrome 518 # See http://www.chromium.org/developers/testing/webdriver-for-chrome
519 'target_name': 'chromedriver_lib', 519 'target_name': 'chromedriver_lib',
520 'type': 'static_library', 520 'type': 'static_library',
521 'dependencies': [ 521 'dependencies': [
522 'browser',
523 'chrome',
524 'chrome_resources.gyp:chrome_resources',
525 'chrome_resources.gyp:chrome_strings',
526 'chromedriver_support',
527 'common',
528 'test_support_ui',
529 'test_support_ui_runner',
530 '../base/base.gyp:base', 522 '../base/base.gyp:base',
531 '../build/temp_gyp/googleurl.gyp:googleurl',
532 '../net/net.gyp:net', 523 '../net/net.gyp:net',
533 '../skia/skia.gyp:skia', 524 '../skia/skia.gyp:skia',
534 '../sync/sync.gyp:sync', 525 '../sync/sync.gyp:sync',
535 '../testing/gtest.gyp:gtest', 526 '../testing/gtest.gyp:gtest',
536 '../third_party/icu/icu.gyp:icui18n', 527 '../third_party/icu/icu.gyp:icui18n',
537 '../third_party/icu/icu.gyp:icuuc', 528 '../third_party/icu/icu.gyp:icuuc',
538 '../third_party/libxml/libxml.gyp:libxml', 529 '../third_party/libxml/libxml.gyp:libxml',
530 '../url/url.gyp:url',
531 'browser',
532 'chrome',
533 'chrome_resources.gyp:chrome_resources',
534 'chrome_resources.gyp:chrome_strings',
535 'chromedriver_support',
536 'common',
537 'test_support_ui',
538 'test_support_ui_runner',
539 ], 539 ],
540 'include_dirs': [ 540 'include_dirs': [
541 '..', 541 '..',
542 ], 542 ],
543 'sources': [ 543 'sources': [
544 'test/webdriver/commands/alert_commands.cc', 544 'test/webdriver/commands/alert_commands.cc',
545 'test/webdriver/commands/alert_commands.h', 545 'test/webdriver/commands/alert_commands.h',
546 'test/webdriver/commands/appcache_status_command.cc', 546 'test/webdriver/commands/appcache_status_command.cc',
547 'test/webdriver/commands/appcache_status_command.h', 547 'test/webdriver/commands/appcache_status_command.h',
548 'test/webdriver/commands/browser_connection_commands.cc', 548 'test/webdriver/commands/browser_connection_commands.cc',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 }], 763 }],
764 ], 764 ],
765 }, 765 },
766 { 766 {
767 'target_name': 'chrome_devtools_lib', 767 'target_name': 'chrome_devtools_lib',
768 'type': 'static_library', 768 'type': 'static_library',
769 'hard_dependency': 1, 769 'hard_dependency': 1,
770 'dependencies': [ 770 'dependencies': [
771 '../base/base.gyp:base', 771 '../base/base.gyp:base',
772 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 772 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
773 '../build/temp_gyp/googleurl.gyp:googleurl',
774 '../net/net.gyp:net', 773 '../net/net.gyp:net',
775 '../third_party/zlib/zlib.gyp:minizip', 774 '../third_party/zlib/zlib.gyp:minizip',
776 '../third_party/zlib/zlib.gyp:zlib', 775 '../third_party/zlib/zlib.gyp:zlib',
777 '../ui/ui.gyp:ui', 776 '../ui/ui.gyp:ui',
777 '../url/url.gyp:url',
778 ], 778 ],
779 'include_dirs': [ 779 'include_dirs': [
780 '..', 780 '..',
781 '<(SHARED_INTERMEDIATE_DIR)', 781 '<(SHARED_INTERMEDIATE_DIR)',
782 ], 782 ],
783 'direct_dependent_settings': { 783 'direct_dependent_settings': {
784 'include_dirs': [ 784 'include_dirs': [
785 '<(SHARED_INTERMEDIATE_DIR)', 785 '<(SHARED_INTERMEDIATE_DIR)',
786 ], 786 ],
787 }, 787 },
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 'test/chromedriver/synchronized_map_unittest.cc', 1088 'test/chromedriver/synchronized_map_unittest.cc',
1089 'test/chromedriver/util_unittest.cc', 1089 'test/chromedriver/util_unittest.cc',
1090 ], 1090 ],
1091 }, 1091 },
1092 # ChromeDriver2 tests that aren't run on the main buildbot. Available 1092 # ChromeDriver2 tests that aren't run on the main buildbot. Available
1093 # as an optional test type on trybots. 1093 # as an optional test type on trybots.
1094 { 1094 {
1095 'target_name': 'chromedriver2_tests', 1095 'target_name': 'chromedriver2_tests',
1096 'type': 'executable', 1096 'type': 'executable',
1097 'dependencies': [ 1097 'dependencies': [
1098 'chromedriver2_lib',
1099 '../base/base.gyp:base', 1098 '../base/base.gyp:base',
1100 '../base/base.gyp:run_all_unittests', 1099 '../base/base.gyp:run_all_unittests',
1101 '../build/temp_gyp/googleurl.gyp:googleurl',
1102 '../net/net.gyp:http_server', 1100 '../net/net.gyp:http_server',
1103 '../net/net.gyp:net', 1101 '../net/net.gyp:net',
1104 '../net/net.gyp:net_test_support', 1102 '../net/net.gyp:net_test_support',
1105 '../testing/gtest.gyp:gtest', 1103 '../testing/gtest.gyp:gtest',
1104 '../url/url.gyp:url',
1105 'chromedriver2_lib',
1106 ], 1106 ],
1107 'include_dirs': [ 1107 'include_dirs': [
1108 '..,' 1108 '..,'
1109 ], 1109 ],
1110 'sources': [ 1110 'sources': [
1111 'test/chromedriver/key_converter_unittest.cc', 1111 'test/chromedriver/key_converter_unittest.cc',
1112 'test/chromedriver/keycode_text_conversion_unittest.cc', 1112 'test/chromedriver/keycode_text_conversion_unittest.cc',
1113 'test/chromedriver/net/net_util_unittest.cc', 1113 'test/chromedriver/net/net_util_unittest.cc',
1114 'test/chromedriver/net/sync_websocket_impl_unittest.cc', 1114 'test/chromedriver/net/sync_websocket_impl_unittest.cc',
1115 'test/chromedriver/net/test_http_server.cc', 1115 'test/chromedriver/net/test_http_server.cc',
(...skipping 2272 matching lines...) Expand 10 before | Expand all | Expand 10 after
3388 # more details. 3388 # more details.
3389 'DebugInformationFormat': '3', 3389 'DebugInformationFormat': '3',
3390 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb', 3390 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
3391 }, 3391 },
3392 }, 3392 },
3393 }, 3393 },
3394 ], 3394 ],
3395 }], 3395 }],
3396 ], # 'conditions' 3396 ], # 'conditions'
3397 } 3397 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698