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

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

Issue 1316843006: Revert of Un-nest configs in GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | sdch/BUILD.gn » ('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 config("gtest_config") { 5 config("gtest_config") {
6 visibility = [ 6 visibility = [
7 ":*", 7 ":*",
8 "//testing/gmock:*", # gmock also shares this config. 8 "//testing/gmock:*", # gmock also shares this config.
9 ] 9 ]
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 "GTEST_HAS_TR1_TUPLE=1", 51 "GTEST_HAS_TR1_TUPLE=1",
52 ] 52 ]
53 } 53 }
54 } 54 }
55 55
56 config("gtest_direct_config") { 56 config("gtest_direct_config") {
57 visibility = [ ":*" ] 57 visibility = [ ":*" ]
58 defines = [ "UNIT_TEST" ] 58 defines = [ "UNIT_TEST" ]
59 } 59 }
60 60
61 config("gtest_warnings") {
62 if (is_win && is_clang) {
63 # The Mutex constructor initializer list in gtest-port.cc is incorrectly
64 # ordered. See
65 # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6 sJ.
66 cflags = [ "-Wno-reorder" ]
67 }
68 }
69
70 static_library("gtest") { 61 static_library("gtest") {
71 # TODO http://crbug.com/412064 enable this flag all the time. 62 # TODO http://crbug.com/412064 enable this flag all the time.
72 testonly = !is_component_build 63 testonly = !is_component_build
73 sources = [ 64 sources = [
74 "include/gtest/gtest-death-test.h", 65 "include/gtest/gtest-death-test.h",
75 "include/gtest/gtest-message.h", 66 "include/gtest/gtest-message.h",
76 "include/gtest/gtest-param-test.h", 67 "include/gtest/gtest-param-test.h",
77 "include/gtest/gtest-printers.h", 68 "include/gtest/gtest-printers.h",
78 "include/gtest/gtest-spi.h", 69 "include/gtest/gtest-spi.h",
79 "include/gtest/gtest-test-part.h", 70 "include/gtest/gtest-test-part.h",
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 116 }
126 117
127 include_dirs = [ "." ] 118 include_dirs = [ "." ]
128 119
129 all_dependent_configs = [ ":gtest_config" ] 120 all_dependent_configs = [ ":gtest_config" ]
130 public_configs = [ ":gtest_direct_config" ] 121 public_configs = [ ":gtest_direct_config" ]
131 122
132 configs -= [ "//build/config/compiler:chromium_code" ] 123 configs -= [ "//build/config/compiler:chromium_code" ]
133 configs += [ "//build/config/compiler:no_chromium_code" ] 124 configs += [ "//build/config/compiler:no_chromium_code" ]
134 125
126 config("gtest_warnings") {
127 if (is_win && is_clang) {
128 # The Mutex constructor initializer list in gtest-port.cc is incorrectly
129 # ordered. See
130 # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6 J6sJ.
131 cflags = [ "-Wno-reorder" ]
132 }
133 }
135 configs += [ ":gtest_warnings" ] 134 configs += [ ":gtest_warnings" ]
136 } 135 }
137 136
138 source_set("gtest_main") { 137 source_set("gtest_main") {
139 # TODO http://crbug.com/412064 enable this flag all the time. 138 # TODO http://crbug.com/412064 enable this flag all the time.
140 testonly = !is_component_build 139 testonly = !is_component_build
141 sources = [ 140 sources = [
142 "src/gtest_main.cc", 141 "src/gtest_main.cc",
143 ] 142 ]
144 deps = [ 143 deps = [
145 ":gtest", 144 ":gtest",
146 ] 145 ]
147 } 146 }
OLDNEW
« no previous file with comments | « no previous file | sdch/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698