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

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

Issue 1274213005: Disable NaCl browser_tests for GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits 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
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")
11 import("//testing/test.gni") 11 import("//testing/test.gni")
12 12
13 declare_args() {
14 # TODO(GYP) http://crbug.com/462791
15 enable_nacl_browsertests = false
16 }
17
13 # This target exists to reference other test executables to bring these files 18 # This target exists to reference other test executables to bring these files
14 # into the build. 19 # into the build.
15 group("test") { 20 group("test") {
16 testonly = true 21 testonly = true
17 } 22 }
18 23
19 # GYP version: chrome/chrome_tests_unit.gypi:test_support_common 24 # GYP version: chrome/chrome_tests_unit.gypi:test_support_common
20 source_set("test_support") { 25 source_set("test_support") {
21 defines = [] 26 defines = []
22 testonly = true 27 testonly = true
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 "//ppapi:ppapi_tests", 676 "//ppapi:ppapi_tests",
672 "//ppapi:power_saver_test_plugin", 677 "//ppapi:power_saver_test_plugin",
673 "//remoting/webapp:browser_test_resources", 678 "//remoting/webapp:browser_test_resources",
674 "//remoting/webapp:unit_tests", 679 "//remoting/webapp:unit_tests",
675 "//third_party/mesa:osmesa", 680 "//third_party/mesa:osmesa",
676 "//third_party/widevine/cdm:widevine_test_license_server", 681 "//third_party/widevine/cdm:widevine_test_license_server",
677 ] 682 ]
678 683
679 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 684 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
680 685
686 if (!enable_nacl_browsertests) {
687 defines += [ "DISABLE_NACL_BROWSERTESTS" ]
688 }
689
681 # TODO(GYP) if (is_win) { 690 # TODO(GYP) if (is_win) {
682 # ['incremental_chrome_dll==1', { 691 # ['incremental_chrome_dll==1', {
683 # 'UseLibraryDependencyInputs': "true", 692 # 'UseLibraryDependencyInputs': "true",
684 # } 693 # }
685 694
686 if (cld_version == 2) { 695 if (cld_version == 2) {
687 # Because the browser_tests use translate, they need CLD data. 696 # Because the browser_tests use translate, they need CLD data.
688 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 697 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
689 } 698 }
690 699
691 if (!enable_one_click_signin) { 700 if (!enable_one_click_signin) {
692 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br owsertest.cc" ] 701 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br owsertest.cc" ]
693 } 702 }
694 if (enable_nacl) { 703 if (!enable_nacl_browsertests) {
704 sources -= [ "../browser/extensions/api/hotword_private/hotword_private_ap itest.cc" ]
705 } else if (enable_nacl) {
695 sources += [ 706 sources += [
696 "../browser/extensions/extension_nacl_browsertest.cc", 707 "../browser/extensions/extension_nacl_browsertest.cc",
697 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", 708 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc",
698 ] 709 ]
699 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] 710 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
700 711
701 if (enable_nacl_untrusted) { 712 if (enable_nacl_untrusted) {
702 sources += [ 713 sources += [
703 "nacl/nacl_browsertest.cc", 714 "nacl/nacl_browsertest.cc",
704 "nacl/nacl_browsertest_uma.cc", 715 "nacl/nacl_browsertest_uma.cc",
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc", 960 "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc",
950 "../renderer/spellchecker/spellcheck_unittest.cc", 961 "../renderer/spellchecker/spellcheck_unittest.cc",
951 ] 962 ]
952 } 963 }
953 if (is_chromeos) { 964 if (is_chromeos) {
954 sources += [ 965 sources += [
955 "../browser/extensions/api/networking_private/networking_private_apitest .cc", 966 "../browser/extensions/api/networking_private/networking_private_apitest .cc",
956 "../browser/extensions/api/networking_private/networking_private_chromeo s_apitest.cc", 967 "../browser/extensions/api/networking_private/networking_private_chromeo s_apitest.cc",
957 ] 968 ]
958 } 969 }
959 if (!is_android && !is_ios) { 970 if (!is_android && !is_ios && enable_nacl_browsertests) {
960 sources += 971 sources +=
961 [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ] 972 [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ]
962 deps += [ "//components/copresence" ] 973 deps += [ "//components/copresence" ]
963 } 974 }
964 if (enable_app_list) { 975 if (enable_app_list) {
965 sources += rebase_path( 976 sources += rebase_path(
966 chrome_tests_gypi_values.chrome_browser_tests_app_list_sources, 977 chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
967 ".", 978 ".",
968 "//chrome") 979 "//chrome")
969 } 980 }
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 "//third_party/mojo/src/mojo/edk/system", 1904 "//third_party/mojo/src/mojo/edk/system",
1894 ] 1905 ]
1895 1906
1896 if (!is_android && use_ash) { 1907 if (!is_android && use_ash) {
1897 sources += rebase_path( 1908 sources += rebase_path(
1898 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 1909 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
1899 ".", 1910 ".",
1900 "//chrome") 1911 "//chrome")
1901 } 1912 }
1902 } 1913 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698