| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//chrome/chrome_tests.gni") | 9 import("//chrome/chrome_tests.gni") |
| 10 import("//chrome/test/base/js2gtest.gni") | 10 import("//chrome/test/base/js2gtest.gni") |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 | 399 |
| 400 if (is_mac) { | 400 if (is_mac) { |
| 401 datadeps += [ "//chrome" ] | 401 datadeps += [ "//chrome" ] |
| 402 | 402 |
| 403 # TODO(mark): We really want this for all non-static library targets, but | 403 # TODO(mark): We really want this for all non-static library targets, but |
| 404 # when we tried to pull it up to the common.gypi level, it broke other | 404 # when we tried to pull it up to the common.gypi level, it broke other |
| 405 # things like the ui and startup tests. *shrug* | 405 # things like the ui and startup tests. *shrug* |
| 406 ldflags += [ "-Wl,-ObjC" ] | 406 ldflags += [ "-Wl,-ObjC" ] |
| 407 } | 407 } |
| 408 | 408 |
| 409 if (cld_version == 0 || cld_version == 2) { | 409 if (cld_version == 2) { |
| 410 # Interactive tests should use whatever CLD2 data access mode that the | 410 # Interactive tests should use whatever CLD2 data access mode that the |
| 411 # application embedder is using. | 411 # application embedder is using. |
| 412 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 412 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 413 } | 413 } |
| 414 | 414 |
| 415 if (use_x11) { | 415 if (use_x11) { |
| 416 configs += [ "//build/config/linux:xtst" ] | 416 configs += [ "//build/config/linux:xtst" ] |
| 417 datadeps += [ "//tools/xdisplaycheck" ] | 417 datadeps += [ "//tools/xdisplaycheck" ] |
| 418 } | 418 } |
| 419 | 419 |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 "//third_party/widevine/cdm:widevine_test_license_server", | 628 "//third_party/widevine/cdm:widevine_test_license_server", |
| 629 ] | 629 ] |
| 630 | 630 |
| 631 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] | 631 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
| 632 | 632 |
| 633 # TODO(GYP) if (is_win) { | 633 # TODO(GYP) if (is_win) { |
| 634 # ['incremental_chrome_dll==1', { | 634 # ['incremental_chrome_dll==1', { |
| 635 # 'UseLibraryDependencyInputs': "true", | 635 # 'UseLibraryDependencyInputs': "true", |
| 636 # } | 636 # } |
| 637 | 637 |
| 638 if (cld_version == 0 || cld_version == 2) { | 638 if (cld_version == 2) { |
| 639 # Because the browser_tests use translate, they need CLD data. | 639 # Because the browser_tests use translate, they need CLD data. |
| 640 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 640 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 641 } | 641 } |
| 642 | 642 |
| 643 if (!enable_one_click_signin) { | 643 if (!enable_one_click_signin) { |
| 644 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br
owsertest.cc" ] | 644 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br
owsertest.cc" ] |
| 645 } | 645 } |
| 646 if (enable_nacl) { | 646 if (enable_nacl) { |
| 647 sources += [ | 647 sources += [ |
| 648 "../browser/extensions/extension_nacl_browsertest.cc", | 648 "../browser/extensions/extension_nacl_browsertest.cc", |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 998 "//chrome/renderer", | 998 "//chrome/renderer", |
| 999 "//crypto:platform", | 999 "//crypto:platform", |
| 1000 "//sync", | 1000 "//sync", |
| 1001 "//testing/gmock", | 1001 "//testing/gmock", |
| 1002 "//testing/gtest", | 1002 "//testing/gtest", |
| 1003 "//third_party/icu", | 1003 "//third_party/icu", |
| 1004 "//third_party/leveldatabase", | 1004 "//third_party/leveldatabase", |
| 1005 "//third_party/WebKit/public:blink", | 1005 "//third_party/WebKit/public:blink", |
| 1006 ] | 1006 ] |
| 1007 | 1007 |
| 1008 if (cld_version == 0 || cld_version == 2) { | 1008 if (cld_version == 2) { |
| 1009 # Language detection is irrelevant to sync, so it can depend on any | 1009 # Language detection is irrelevant to sync, so it can depend on any |
| 1010 # implementation for CLD2. Dynamic is smaller, so go with dynamic. | 1010 # implementation for CLD2. Dynamic is smaller, so go with dynamic. |
| 1011 deps += [ "//third_party/cld_2:cld2_dynamic" ] | 1011 deps += [ "//third_party/cld_2:cld2_dynamic" ] |
| 1012 } | 1012 } |
| 1013 if (is_mac) { | 1013 if (is_mac) { |
| 1014 # Dictionary sync is disabled on Mac. | 1014 # Dictionary sync is disabled on Mac. |
| 1015 sources -= [ | 1015 sources -= [ |
| 1016 "../browser/sync/test/integration/multiple_client_dictionary_sync_test.c
c", | 1016 "../browser/sync/test/integration/multiple_client_dictionary_sync_test.c
c", |
| 1017 "../browser/sync/test/integration/single_client_dictionary_sync_test.cc"
, | 1017 "../browser/sync/test/integration/single_client_dictionary_sync_test.cc"
, |
| 1018 "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", | 1018 "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1069 | 1069 |
| 1070 deps = [ | 1070 deps = [ |
| 1071 ":sync_integration_test_support", | 1071 ":sync_integration_test_support", |
| 1072 "//base/allocator", | 1072 "//base/allocator", |
| 1073 "//crypto:platform", | 1073 "//crypto:platform", |
| 1074 "//sync", | 1074 "//sync", |
| 1075 "//testing/gmock", | 1075 "//testing/gmock", |
| 1076 "//testing/gtest", | 1076 "//testing/gtest", |
| 1077 ] | 1077 ] |
| 1078 | 1078 |
| 1079 if (cld_version == 0 || cld_version == 2) { | 1079 if (cld_version == 2) { |
| 1080 # Language detection is irrelevant to sync, so it can depend on any | 1080 # Language detection is irrelevant to sync, so it can depend on any |
| 1081 # implementation for CLD2. Dynamic is smaller, so go with dynamic. | 1081 # implementation for CLD2. Dynamic is smaller, so go with dynamic. |
| 1082 deps += [ "//third_party/cld_2:cld2_dynamic" ] | 1082 deps += [ "//third_party/cld_2:cld2_dynamic" ] |
| 1083 } | 1083 } |
| 1084 | 1084 |
| 1085 if (is_mac) { | 1085 if (is_mac) { |
| 1086 # Dictionary sync is disabled on Mac. | 1086 # Dictionary sync is disabled on Mac. |
| 1087 sources -= [ "../browser/sync/test/integration/performance/dictionary_sync
_perf_test.cc" ] | 1087 sources -= [ "../browser/sync/test/integration/performance/dictionary_sync
_perf_test.cc" ] |
| 1088 | 1088 |
| 1089 # The sync_performance_tests do not run on mac without this flag. | 1089 # The sync_performance_tests do not run on mac without this flag. |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1493 "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc"
, | 1493 "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc"
, |
| 1494 "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc", | 1494 "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc", |
| 1495 ] | 1495 ] |
| 1496 } | 1496 } |
| 1497 if (use_x11) { | 1497 if (use_x11) { |
| 1498 deps += [ "//ui/events/devices" ] | 1498 deps += [ "//ui/events/devices" ] |
| 1499 data_deps += [ "//tools/xdisplaycheck" ] | 1499 data_deps += [ "//tools/xdisplaycheck" ] |
| 1500 } else { | 1500 } else { |
| 1501 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] | 1501 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] |
| 1502 } | 1502 } |
| 1503 if (cld_version == 0 || cld_version == 2) { | 1503 if (cld_version == 2) { |
| 1504 # Unit tests should be independent of the CLD2 access mechanism, just use | 1504 # Unit tests should be independent of the CLD2 access mechanism, just use |
| 1505 # static for simplicity. | 1505 # static for simplicity. |
| 1506 deps += [ "//third_party/cld_2:cld2_static" ] | 1506 deps += [ "//third_party/cld_2:cld2_static" ] |
| 1507 } | 1507 } |
| 1508 if (is_desktop_linux && current_cpu == "x64") { | 1508 if (is_desktop_linux && current_cpu == "x64") { |
| 1509 # Only add this test for 64 bit builds because otherwise we need the 32 | 1509 # Only add this test for 64 bit builds because otherwise we need the 32 |
| 1510 # bit library on 64 bit systems when running this test. | 1510 # bit library on 64 bit systems when running this test. |
| 1511 sources += | 1511 sources += |
| 1512 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ] | 1512 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ] |
| 1513 configs += [ | 1513 configs += [ |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1694 ] | 1694 ] |
| 1695 | 1695 |
| 1696 deps = [ | 1696 deps = [ |
| 1697 ":test_support", | 1697 ":test_support", |
| 1698 "//breakpad:client", | 1698 "//breakpad:client", |
| 1699 "//chrome/browser", | 1699 "//chrome/browser", |
| 1700 "//chrome/child", | 1700 "//chrome/child", |
| 1701 "//base/test:run_all_unittests", | 1701 "//base/test:run_all_unittests", |
| 1702 "//base/test:test_support", | 1702 "//base/test:test_support", |
| 1703 ] | 1703 ] |
| 1704 if (cld_version == 0 || cld_version == 2) { | 1704 if (cld_version == 2) { |
| 1705 # Use whatever CLD2 data access mode that the | 1705 # Use whatever CLD2 data access mode that the |
| 1706 # application embedder is using. | 1706 # application embedder is using. |
| 1707 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 1707 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 1708 } | 1708 } |
| 1709 } | 1709 } |
| 1710 | 1710 |
| 1711 test("performance_browser_tests") { | 1711 test("performance_browser_tests") { |
| 1712 sources = rebase_path( | 1712 sources = rebase_path( |
| 1713 chrome_tests_gypi_values.performance_browser_tests_sources, | 1713 chrome_tests_gypi_values.performance_browser_tests_sources, |
| 1714 ".", | 1714 ".", |
| (...skipping 26 matching lines...) Expand all Loading... |
| 1741 | 1741 |
| 1742 #"../app/chrome_dll.rc", | 1742 #"../app/chrome_dll.rc", |
| 1743 #"../app/chrome_dll_resource.h", | 1743 #"../app/chrome_dll_resource.h", |
| 1744 "../app/chrome_version.rc.version", | 1744 "../app/chrome_version.rc.version", |
| 1745 ] | 1745 ] |
| 1746 } | 1746 } |
| 1747 if (!is_mac) { | 1747 if (!is_mac) { |
| 1748 sources -= [ "perf/mach_ports_performancetest.cc" ] | 1748 sources -= [ "perf/mach_ports_performancetest.cc" ] |
| 1749 } | 1749 } |
| 1750 | 1750 |
| 1751 if (cld_version == 0 || cld_version == 2) { | 1751 if (cld_version == 2) { |
| 1752 # Use whatever CLD2 data access mode that the | 1752 # Use whatever CLD2 data access mode that the |
| 1753 # application embedder is using. | 1753 # application embedder is using. |
| 1754 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 1754 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 1755 } | 1755 } |
| 1756 } | 1756 } |
| 1757 } | 1757 } |
| 1758 } | 1758 } |
| 1759 | 1759 |
| 1760 source_set("test_support_unit") { | 1760 source_set("test_support_unit") { |
| 1761 testonly = true | 1761 testonly = true |
| (...skipping 14 matching lines...) Expand all Loading... |
| 1776 "//third_party/mojo/src/mojo/edk/system", | 1776 "//third_party/mojo/src/mojo/edk/system", |
| 1777 ] | 1777 ] |
| 1778 | 1778 |
| 1779 if (!is_android && use_ash) { | 1779 if (!is_android && use_ash) { |
| 1780 sources += rebase_path( | 1780 sources += rebase_path( |
| 1781 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 1781 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 1782 ".", | 1782 ".", |
| 1783 "//chrome") | 1783 "//chrome") |
| 1784 } | 1784 } |
| 1785 } | 1785 } |
| OLD | NEW |