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

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

Issue 1250913002: patch from chinmaygarde@ to make progress on mac, ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks needed to get base_unittests to compile Created 5 years, 5 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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 } 9 }
10 10
11 source_set("test_config") { 11 source_set("test_config") {
12 # TODO http://crbug.com/412064 enable this flag all the time. 12 # TODO http://crbug.com/412064 enable this flag all the time.
13 testonly = !is_component_build 13 testonly = !is_component_build
14 sources = [ 14 sources = [
15 "test_switches.cc", 15 "test_switches.cc",
16 "test_switches.h", 16 "test_switches.h",
17 "test_timeouts.cc", 17 "test_timeouts.cc",
18 "test_timeouts.h", 18 "test_timeouts.h",
19 ] 19 ]
20 deps = [ 20 deps = [
21 "//base", 21 "//base",
22 ] 22 ]
23 } 23 }
24 24
25 # GYP: //base/base.gyp:test_support_base 25 # GYP: //base/base.gyp:test_support_base
26 source_set("test_support") { 26 static_library("test_support") {
sdefresne 2015/07/25 19:15:29 Why the change from "source_set" to "static_librar
Dirk Pranke 2015/07/31 21:27:40 source_set is recommended, you're right. I had in
27 # TODO http://crbug.com/412064 enable this flag all the time. 27 # TODO http://crbug.com/412064 enable this flag all the time.
28 testonly = !is_component_build 28 testonly = !is_component_build
29 sources = [ 29 sources = [
30 "gtest_util.cc", 30 "gtest_util.cc",
31 "gtest_util.h", 31 "gtest_util.h",
32 "gtest_xml_unittest_result_printer.cc", 32 "gtest_xml_unittest_result_printer.cc",
33 "gtest_xml_unittest_result_printer.h", 33 "gtest_xml_unittest_result_printer.h",
34 "gtest_xml_util.cc", 34 "gtest_xml_util.cc",
35 "gtest_xml_util.h", 35 "gtest_xml_util.h",
36 "histogram_tester.cc", 36 "histogram_tester.cc",
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 if (!is_posix) { 147 if (!is_posix) {
148 sources -= [ 148 sources -= [
149 "scoped_locale.cc", 149 "scoped_locale.cc",
150 "scoped_locale.h", 150 "scoped_locale.h",
151 ] 151 ]
152 } 152 }
153 if (is_ios) { 153 if (is_ios) {
154 # iOS uses its own unit test launcher. 154 # iOS uses its own unit test launcher.
155 sources -= [ "launcher/unit_test_launcher.cc" ] 155 sources -= [ "launcher/unit_test_launcher.cc" ]
156 156
157 sources -= [ "multiprocess_test.cc" ]
158
157 # Pull in specific Mac files for iOS (which have been filtered out 159 # Pull in specific Mac files for iOS (which have been filtered out
158 # by file name rules). 160 # by file name rules).
159 set_sources_assignment_filter([]) 161 set_sources_assignment_filter([])
160 sources += [ "test_file_util_mac.cc" ] 162 sources += [ "test_file_util_mac.cc" ]
161 } 163 }
162 164
163 if (is_android) { 165 if (is_android) {
164 deps += [ ":base_unittests_jni_headers" ] 166 deps += [ ":base_unittests_jni_headers" ]
165 } 167 }
166 } 168 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 209
208 if (is_android) { 210 if (is_android) {
209 generate_jni("base_unittests_jni_headers") { 211 generate_jni("base_unittests_jni_headers") {
210 sources = [ 212 sources = [
211 "android/java/src/org/chromium/base/ContentUriTestUtils.java", 213 "android/java/src/org/chromium/base/ContentUriTestUtils.java",
212 "android/java/src/org/chromium/base/TestUiThread.java", 214 "android/java/src/org/chromium/base/TestUiThread.java",
213 ] 215 ]
214 jni_package = "base" 216 jni_package = "base"
215 } 217 }
216 } 218 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698