From e7ebdf019ee084e79cd7044262d44b7042a692b7 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Tue, 19 Dec 2017 16:48:09 -0800 Subject: [PATCH] gn: Add missing testonly for chromium and fuchsia styles Bug: crashpad:79, crashpad:196 Change-Id: I8354b8430cfe4728a635991fb59fcc8ef8652773 Reviewed-on: https://chromium-review.googlesource.com/835468 Reviewed-by: Mark Mentovai Commit-Queue: Scott Graham --- third_party/gtest/BUILD.gn | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/third_party/gtest/BUILD.gn b/third_party/gtest/BUILD.gn index 3a955a54..d2702315 100644 --- a/third_party/gtest/BUILD.gn +++ b/third_party/gtest/BUILD.gn @@ -17,23 +17,29 @@ import("../../build/test.gni") if (crashpad_is_in_chromium) { group("gtest") { + testonly = true public_deps = [ "//testing/gtest", ] } group("gmock") { + testonly = true public_deps = [ "//testing/gmock", ] } } else if (crashpad_is_in_fuchsia) { - # TODO(scottmg): Fuchsia doesn't have a third_party/gmock, and has a - # pre-gmock-integration gtest. group("gtest") { + testonly = true public_deps = [ "//third_party/gtest", ] } + group("gmock") { + testonly = true + # TODO(scottmg): Fuchsia doesn't have a third_party/gmock, and has a + # pre-gmock-integration gtest. + } } else if (crashpad_is_standalone) { config("gtest_private_config") { visibility = [ ":*" ] @@ -84,7 +90,9 @@ if (crashpad_is_in_chromium) { ] sources -= [ "gtest/googletest/src/gtest-all.cc" ] public_configs = [ ":gtest_public_config" ] - configs -= [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ] + configs -= [ + "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", + ] configs += [ ":gtest_private_config" ] } @@ -121,7 +129,9 @@ if (crashpad_is_in_chromium) { "gtest/googletest/test/production.cc", "gtest/googletest/test/production.h", ] - configs -= [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ] + configs -= [ + "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", + ] configs += [ ":gtest_private_config" ] deps = [ ":gtest", @@ -163,7 +173,9 @@ if (crashpad_is_in_chromium) { "gtest/googletest/test/gtest-param-test_test.cc", "gtest/googletest/test/gtest-param-test_test.h", ] - configs -= [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ] + configs -= [ + "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", + ] configs += [ ":gtest_private_config" ] deps = [ ":gtest", @@ -291,7 +303,9 @@ if (crashpad_is_in_chromium) { ] sources -= [ "gtest/googlemock/src/gmock-all.cc" ] public_configs = [ ":gmock_public_config" ] - configs -= [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ] + configs -= [ + "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", + ] configs += [ ":gmock_private_config" ] deps = [ ":gtest", @@ -364,7 +378,9 @@ if (crashpad_is_in_chromium) { sources = [ "gtest/googlemock/test/gmock_stress_test.cc", ] - configs -= [ "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors" ] + configs -= [ + "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors", + ] configs += [ ":gmock_private_config" ] deps = [ ":gmock",