Index: webrtc/base/BUILD.gn |
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn |
index c42f0564eae4e42a7b5ce5dcf7c019d5fd6f3f02..ba31c3be2c275f072be5cf193a6c9a714b8c5827 100644 |
--- a/webrtc/base/BUILD.gn |
+++ b/webrtc/base/BUILD.gn |
@@ -706,6 +706,26 @@ if (rtc_include_tests) { |
} |
} |
+ rtc_source_set("rtc_base_tests_main") { |
+ testonly = true |
+ sources = [ |
+ "unittest_main.cc", |
+ ] |
+ public_configs = [ ":rtc_base_tests_utils_exported_config" ] |
+ deps = [ |
+ ":rtc_base_tests_utils", |
+ ] |
+ public_deps = [ |
+ "//testing/gmock", |
+ "//testing/gtest", |
+ ] |
+ |
+ if (!build_with_chromium && is_clang) { |
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
+ } |
+ } |
+ |
rtc_source_set("rtc_base_tests_utils") { |
testonly = true |
sources = [ |
@@ -731,7 +751,6 @@ if (rtc_include_tests) { |
"testechoserver.h", |
"testutils.h", |
"timedelta.h", |
- "unittest_main.cc", |
] |
configs += [ ":rtc_base_tests_utils_warnings_config" ] |
public_configs = [ ":rtc_base_tests_utils_exported_config" ] |
@@ -763,7 +782,7 @@ if (rtc_include_tests) { |
] |
deps = [ |
":rtc_base", |
- ":rtc_base_tests_utils", |
+ ":rtc_base_tests_main", |
"//testing/gtest", |
] |
if (is_win) { |
@@ -818,7 +837,7 @@ if (rtc_include_tests) { |
] |
deps = [ |
":rtc_base_approved", |
- ":rtc_base_tests_utils", |
+ ":rtc_base_tests_main", |
] |
if (!build_with_chromium && is_clang) { |
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
@@ -834,7 +853,7 @@ if (rtc_include_tests) { |
"weak_ptr_unittest.cc", |
] |
deps = [ |
- ":rtc_base_tests_utils", |
+ ":rtc_base_tests_main", |
":rtc_task_queue", |
] |
if (!build_with_chromium && is_clang) { |
@@ -851,7 +870,7 @@ if (rtc_include_tests) { |
] |
deps = [ |
":rtc_analytics", |
- ":rtc_base_tests_utils", |
+ ":rtc_base_tests_main", |
] |
} |
@@ -912,7 +931,7 @@ if (rtc_include_tests) { |
] |
} |
deps = [ |
- ":rtc_base_tests_utils", |
+ ":rtc_base_tests_main", |
] |
public_deps = [ |
":rtc_base", |