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

Side by Side Diff: build/secondary/testing/gtest/BUILD.gn

Issue 2779193002: Roll googletest to 1.8.0. (Closed)
Patch Set: Rebase + trial of GN tweaks needed for v8. Created 3 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
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 # Chromium's GN configuration for gtest now lives at testing/gtest/BUILD.gn.
6 #
7 # This configuration is left in the tree because it is pulled by V8 and PDFium,
8 # and will be removed as soon as the projects switch off of it.
Nico 2017/04/28 20:56:23 I think we should either just remove this or make
pwnall 2017/04/29 00:16:26 If we remove build/secondary, v8 and pdifum can't
Nico 2017/05/01 17:52:54 Ok, let's do this separately. This kind of raises
9 #
10 # Details at http://crbug.com/630705 and http://crrev.com/2779193002
11
5 import("//build_overrides/gtest.gni") 12 import("//build_overrides/gtest.gni")
6 13
7 config("gtest_config") { 14 config("gtest_config") {
8 visibility = [ 15 visibility = [
9 ":*", 16 ":*",
10 "//testing/gmock:*", # gmock also shares this config. 17 "//testing/gmock:*", # gmock also shares this config.
11 ] 18 ]
12 19
13 defines = [ 20 defines = [
14 # In order to allow regex matches in gtest to be shared between Windows 21 # In order to allow regex matches in gtest to be shared between Windows
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 sources += [ 84 sources += [
78 "../multiprocess_func_list.cc", 85 "../multiprocess_func_list.cc",
79 "../multiprocess_func_list.h", 86 "../multiprocess_func_list.h",
80 ] 87 ]
81 } 88 }
82 89
83 if (gtest_include_platform_test) { 90 if (gtest_include_platform_test) {
84 sources += [ "../platform_test.h" ] 91 sources += [ "../platform_test.h" ]
85 } 92 }
86 93
87 if ((is_mac || is_ios) && gtest_include_objc_support) { 94 if ((is_mac || is_ios) && gtest_include_objc_support) {
Nico 2017/04/28 20:56:23 I think this bit is missing from the new BUILD.gn
pwnall 2017/04/29 00:16:26 The Mac bits are in testing/gtest/BUILD.gn -- http
Nico 2017/05/01 17:52:54 I think in general we try to keep third-party libs
88 if (is_ios) { 95 if (is_ios) {
89 set_sources_assignment_filter([]) 96 set_sources_assignment_filter([])
90 } 97 }
91 sources += [ 98 sources += [
92 "../gtest_mac.h", 99 "../gtest_mac.h",
93 "../gtest_mac.mm", 100 "../gtest_mac.mm",
94 ] 101 ]
95 if (gtest_include_platform_test) { 102 if (gtest_include_platform_test) {
96 sources += [ "../platform_test_mac.mm" ] 103 sources += [ "../platform_test_mac.mm" ]
97 } 104 }
(...skipping 23 matching lines...) Expand all
121 128
122 source_set("gtest_main") { 129 source_set("gtest_main") {
123 testonly = true 130 testonly = true
124 sources = [ 131 sources = [
125 "src/gtest_main.cc", 132 "src/gtest_main.cc",
126 ] 133 ]
127 deps = [ 134 deps = [
128 ":gtest", 135 ":gtest",
129 ] 136 ]
130 } 137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698