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

Side by Side Diff: chrome/test/BUILD.gn

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_tests_unit.gypi ('k') | components/components_tests.gyp » ('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 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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 442
443 if (is_mac) { 443 if (is_mac) {
444 data_deps += [ "//chrome" ] 444 data_deps += [ "//chrome" ]
445 445
446 # TODO(mark): We really want this for all non-static library targets, but 446 # TODO(mark): We really want this for all non-static library targets, but
447 # when we tried to pull it up to the common.gypi level, it broke other 447 # when we tried to pull it up to the common.gypi level, it broke other
448 # things like the ui and startup tests. *shrug* 448 # things like the ui and startup tests. *shrug*
449 ldflags += [ "-Wl,-ObjC" ] 449 ldflags += [ "-Wl,-ObjC" ]
450 } 450 }
451 451
452 if (cld_version == 0 || cld_version == 2) { 452 if (cld_version == 2) {
453 # Interactive tests should use whatever CLD2 data access mode that the 453 # Interactive tests should use whatever CLD2 data access mode that the
454 # application embedder is using. 454 # application embedder is using.
455 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 455 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
456 } 456 }
457 457
458 if (use_x11) { 458 if (use_x11) {
459 configs += [ "//build/config/linux:xtst" ] 459 configs += [ "//build/config/linux:xtst" ]
460 data_deps += [ "//tools/xdisplaycheck" ] 460 data_deps += [ "//tools/xdisplaycheck" ]
461 } 461 }
462 462
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 "//third_party/widevine/cdm:widevine_test_license_server", 671 "//third_party/widevine/cdm:widevine_test_license_server",
672 ] 672 ]
673 673
674 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 674 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
675 675
676 # TODO(GYP) if (is_win) { 676 # TODO(GYP) if (is_win) {
677 # ['incremental_chrome_dll==1', { 677 # ['incremental_chrome_dll==1', {
678 # 'UseLibraryDependencyInputs': "true", 678 # 'UseLibraryDependencyInputs': "true",
679 # } 679 # }
680 680
681 if (cld_version == 0 || cld_version == 2) { 681 if (cld_version == 2) {
682 # Because the browser_tests use translate, they need CLD data. 682 # Because the browser_tests use translate, they need CLD data.
683 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 683 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
684 } 684 }
685 685
686 if (!enable_one_click_signin) { 686 if (!enable_one_click_signin) {
687 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br owsertest.cc" ] 687 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br owsertest.cc" ]
688 } 688 }
689 if (enable_nacl) { 689 if (enable_nacl) {
690 sources += [ 690 sources += [
691 "../browser/extensions/extension_nacl_browsertest.cc", 691 "../browser/extensions/extension_nacl_browsertest.cc",
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 "//sync", 1070 "//sync",
1071 "//testing/gmock", 1071 "//testing/gmock",
1072 "//testing/gtest", 1072 "//testing/gtest",
1073 "//third_party/icu", 1073 "//third_party/icu",
1074 "//third_party/leveldatabase", 1074 "//third_party/leveldatabase",
1075 "//third_party/WebKit/public:blink", 1075 "//third_party/WebKit/public:blink",
1076 ] 1076 ]
1077 1077
1078 data_deps = [ "//third_party/mesa:osmesa" ] 1078 data_deps = [ "//third_party/mesa:osmesa" ]
1079 1079
1080 if (cld_version == 0 || cld_version == 2) { 1080 if (cld_version == 2) {
1081 # Language detection is irrelevant to sync, so it can depend on any 1081 # Language detection is irrelevant to sync, so it can depend on any
1082 # implementation for CLD2. Dynamic is smaller, so go with dynamic. 1082 # implementation for CLD2. Dynamic is smaller, so go with dynamic.
1083 deps += [ "//third_party/cld_2:cld2_dynamic" ] 1083 deps += [ "//third_party/cld_2:cld2_dynamic" ]
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 -= [ 1087 sources -= [
1088 "../browser/sync/test/integration/multiple_client_dictionary_sync_test.c c", 1088 "../browser/sync/test/integration/multiple_client_dictionary_sync_test.c c",
1089 "../browser/sync/test/integration/single_client_dictionary_sync_test.cc" , 1089 "../browser/sync/test/integration/single_client_dictionary_sync_test.cc" ,
1090 "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", 1090 "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 1141
1142 deps = [ 1142 deps = [
1143 ":sync_integration_test_support", 1143 ":sync_integration_test_support",
1144 "//base/allocator", 1144 "//base/allocator",
1145 "//crypto:platform", 1145 "//crypto:platform",
1146 "//sync", 1146 "//sync",
1147 "//testing/gmock", 1147 "//testing/gmock",
1148 "//testing/gtest", 1148 "//testing/gtest",
1149 ] 1149 ]
1150 1150
1151 if (cld_version == 0 || cld_version == 2) { 1151 if (cld_version == 2) {
1152 # Language detection is irrelevant to sync, so it can depend on any 1152 # Language detection is irrelevant to sync, so it can depend on any
1153 # implementation for CLD2. Dynamic is smaller, so go with dynamic. 1153 # implementation for CLD2. Dynamic is smaller, so go with dynamic.
1154 deps += [ "//third_party/cld_2:cld2_dynamic" ] 1154 deps += [ "//third_party/cld_2:cld2_dynamic" ]
1155 } 1155 }
1156 1156
1157 if (is_mac) { 1157 if (is_mac) {
1158 # Dictionary sync is disabled on Mac. 1158 # Dictionary sync is disabled on Mac.
1159 sources -= [ "../browser/sync/test/integration/performance/dictionary_sync _perf_test.cc" ] 1159 sources -= [ "../browser/sync/test/integration/performance/dictionary_sync _perf_test.cc" ]
1160 1160
1161 # The sync_performance_tests do not run on mac without this flag. 1161 # The sync_performance_tests do not run on mac without this flag.
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1605 "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc" , 1605 "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc" ,
1606 "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc", 1606 "../browser/ui/views/sync/one_click_signin_bubble_view_unittest.cc",
1607 ] 1607 ]
1608 } 1608 }
1609 if (use_x11) { 1609 if (use_x11) {
1610 deps += [ "//ui/events/devices" ] 1610 deps += [ "//ui/events/devices" ]
1611 data_deps += [ "//tools/xdisplaycheck" ] 1611 data_deps += [ "//tools/xdisplaycheck" ]
1612 } else { 1612 } else {
1613 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 1613 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
1614 } 1614 }
1615 if (cld_version == 0 || cld_version == 2) { 1615 if (cld_version == 2) {
1616 # Unit tests should be independent of the CLD2 access mechanism, just use 1616 # Unit tests should be independent of the CLD2 access mechanism, just use
1617 # static for simplicity. 1617 # static for simplicity.
1618 deps += [ "//third_party/cld_2:cld2_static" ] 1618 deps += [ "//third_party/cld_2:cld2_static" ]
1619 } 1619 }
1620 if (is_desktop_linux && current_cpu == "x64") { 1620 if (is_desktop_linux && current_cpu == "x64") {
1621 # Only add this test for 64 bit builds because otherwise we need the 32 1621 # Only add this test for 64 bit builds because otherwise we need the 32
1622 # bit library on 64 bit systems when running this test. 1622 # bit library on 64 bit systems when running this test.
1623 sources += 1623 sources +=
1624 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ] 1624 [ "../browser/password_manager/native_backend_gnome_x_unittest.cc" ]
1625 configs += [ 1625 configs += [
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 ] 1806 ]
1807 1807
1808 deps = [ 1808 deps = [
1809 ":test_support", 1809 ":test_support",
1810 "//breakpad:client", 1810 "//breakpad:client",
1811 "//chrome/browser", 1811 "//chrome/browser",
1812 "//chrome/child", 1812 "//chrome/child",
1813 "//base/test:run_all_unittests", 1813 "//base/test:run_all_unittests",
1814 "//base/test:test_support", 1814 "//base/test:test_support",
1815 ] 1815 ]
1816 if (cld_version == 0 || cld_version == 2) { 1816 if (cld_version == 2) {
1817 # Use whatever CLD2 data access mode that the 1817 # Use whatever CLD2 data access mode that the
1818 # application embedder is using. 1818 # application embedder is using.
1819 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 1819 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
1820 } 1820 }
1821 } 1821 }
1822 1822
1823 test("performance_browser_tests") { 1823 test("performance_browser_tests") {
1824 sources = rebase_path( 1824 sources = rebase_path(
1825 chrome_tests_gypi_values.performance_browser_tests_sources, 1825 chrome_tests_gypi_values.performance_browser_tests_sources,
1826 ".", 1826 ".",
(...skipping 26 matching lines...) Expand all
1853 1853
1854 #"../app/chrome_dll.rc", 1854 #"../app/chrome_dll.rc",
1855 #"../app/chrome_dll_resource.h", 1855 #"../app/chrome_dll_resource.h",
1856 "../app/chrome_version.rc.version", 1856 "../app/chrome_version.rc.version",
1857 ] 1857 ]
1858 } 1858 }
1859 if (!is_mac) { 1859 if (!is_mac) {
1860 sources -= [ "perf/mach_ports_performancetest.cc" ] 1860 sources -= [ "perf/mach_ports_performancetest.cc" ]
1861 } 1861 }
1862 1862
1863 if (cld_version == 0 || cld_version == 2) { 1863 if (cld_version == 2) {
1864 # Use whatever CLD2 data access mode that the 1864 # Use whatever CLD2 data access mode that the
1865 # application embedder is using. 1865 # application embedder is using.
1866 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 1866 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
1867 } 1867 }
1868 } 1868 }
1869 } 1869 }
1870 } 1870 }
1871 1871
1872 source_set("test_support_unit") { 1872 source_set("test_support_unit") {
1873 testonly = true 1873 testonly = true
(...skipping 14 matching lines...) Expand all
1888 "//third_party/mojo/src/mojo/edk/system", 1888 "//third_party/mojo/src/mojo/edk/system",
1889 ] 1889 ]
1890 1890
1891 if (!is_android && use_ash) { 1891 if (!is_android && use_ash) {
1892 sources += rebase_path( 1892 sources += rebase_path(
1893 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 1893 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
1894 ".", 1894 ".",
1895 "//chrome") 1895 "//chrome")
1896 } 1896 }
1897 } 1897 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698