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

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

Issue 1985903003: gn/linux: Add missing tests to browser_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
« no previous file with comments | « no previous file | no next file » | 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/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 deps += [ "//chrome/browser/chromeos" ] 1015 deps += [ "//chrome/browser/chromeos" ]
1016 data_deps += [ "//third_party/liblouis:liblouis_test_data" ] 1016 data_deps += [ "//third_party/liblouis:liblouis_test_data" ]
1017 } else if (is_linux || is_win) { 1017 } else if (is_linux || is_win) {
1018 sources += [ 1018 sources += [
1019 "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", 1019 "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc",
1020 "../browser/ui/views/ime/ime_window_browsertest.cc", 1020 "../browser/ui/views/ime/ime_window_browsertest.cc",
1021 ] 1021 ]
1022 } 1022 }
1023 1023
1024 if (is_win || is_linux) { 1024 if (is_win || is_linux) {
1025 sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] 1025 sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
Nico 2016/05/17 16:38:14 It's still here, no?
Dirk Pranke 2016/05/17 16:47:21 Oh, sorry, I thought you were adding that in PS2 a
1026 data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] 1026 data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
1027 } 1027 }
1028 if (is_win) { 1028 if (is_win) {
1029 # TODO(halyavin) NaCl on Windows can't open debug stub socket in 1029 # TODO(halyavin) NaCl on Windows can't open debug stub socket in
1030 # browser process as needed by this test. See http://crbug.com/157312. 1030 # browser process as needed by this test. See http://crbug.com/157312.
1031 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] 1031 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ]
1032 configs -= [ "//build/config/win:default_incremental_linking" ] 1032 configs -= [ "//build/config/win:default_incremental_linking" ]
1033 configs += 1033 configs +=
1034 [ "//build/config/win:default_large_module_incremental_linking" ] 1034 [ "//build/config/win:default_large_module_incremental_linking" ]
1035 } 1035 }
(...skipping 25 matching lines...) Expand all
1061 sources += rebase_path( 1061 sources += rebase_path(
1062 chrome_tests_gypi_values.chrome_browser_tests_views_sources, 1062 chrome_tests_gypi_values.chrome_browser_tests_views_sources,
1063 ".", 1063 ".",
1064 "//chrome") 1064 "//chrome")
1065 deps += [ "//ui/views" ] 1065 deps += [ "//ui/views" ]
1066 if (!is_mac) { 1066 if (!is_mac) {
1067 sources += rebase_path( 1067 sources += rebase_path(
1068 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour ces, 1068 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour ces,
1069 ".", 1069 ".",
1070 "//chrome") 1070 "//chrome")
1071 if (!is_chromeos) {
1072 sources += rebase_path(
1073 chrome_tests_gypi_values.chrome_browser_tests_views_non_cros_o r_mac_sources,
1074 ".",
1075 "//chrome")
1076 }
Dirk Pranke 2016/05/17 16:33:06 what happened to nacl_gdb_browsertest.cc?
1071 } 1077 }
1072 } 1078 }
1073 1079
1074 if (is_linux && !is_component_build) { 1080 if (is_linux && !is_component_build) {
1075 # Set rpath to find the CDM adapter even in a non-component build. 1081 # Set rpath to find the CDM adapter even in a non-component build.
1076 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] 1082 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
1077 } 1083 }
1078 1084
1079 if (is_chromeos) { 1085 if (is_chromeos) {
1080 sources += rebase_path( 1086 sources += rebase_path(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 "../browser/invalidation/profile_invalidation_provider_factory_browserte st.cc", 1122 "../browser/invalidation/profile_invalidation_provider_factory_browserte st.cc",
1117 "../browser/net/nss_context_chromeos_browsertest.cc", 1123 "../browser/net/nss_context_chromeos_browsertest.cc",
1118 "data/webui/certificate_viewer_ui_test-inl.h", 1124 "data/webui/certificate_viewer_ui_test-inl.h",
1119 ] 1125 ]
1120 if (use_ash) { 1126 if (use_ash) {
1121 sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ] 1127 sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ]
1122 } 1128 }
1123 if (toolkit_views) { 1129 if (toolkit_views) {
1124 sources -= [ "../browser/ui/views/select_file_dialog_extension_browserte st.cc" ] 1130 sources -= [ "../browser/ui/views/select_file_dialog_extension_browserte st.cc" ]
1125 } 1131 }
1132 if (is_win || is_linux) {
1133 sources +=
1134 [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
1135 }
1126 } 1136 }
1127 if (enable_web_speech) { 1137 if (enable_web_speech) {
1128 sources += rebase_path( 1138 sources += rebase_path(
1129 chrome_tests_gypi_values.chrome_browser_tests_speech_sources, 1139 chrome_tests_gypi_values.chrome_browser_tests_speech_sources,
1130 ".", 1140 ".",
1131 "//chrome") 1141 "//chrome")
1132 } 1142 }
1133 if (safe_browsing_mode == 1) { 1143 if (safe_browsing_mode == 1) {
1134 sources += rebase_path( 1144 sources += rebase_path(
1135 chrome_tests_gypi_values.chrome_browser_tests_full_safe_browsing_s ources, 1145 chrome_tests_gypi_values.chrome_browser_tests_full_safe_browsing_s ources,
(...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
2373 if (is_android) { 2383 if (is_android) {
2374 android_library("unit_tests_java") { 2384 android_library("unit_tests_java") {
2375 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2385 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2376 deps = [ 2386 deps = [
2377 "//base:base_java", 2387 "//base:base_java",
2378 "//chrome/android:chrome_java", 2388 "//chrome/android:chrome_java",
2379 "//content/public/android:content_java", 2389 "//content/public/android:content_java",
2380 ] 2390 ]
2381 } 2391 }
2382 } 2392 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698