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

Unified Diff: webrtc/BUILD.gn

Issue 2200623003: Remove negative include rules from webrtc_nonparallel_tests target (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/webrtc_tests.gypi » ('j') | webrtc/webrtc_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/BUILD.gn
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index be0e88e442a6ac0d24575a07900574ad31a31793..2bc0b630b17ce0df0f4ab7b891bd18789d815d89 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -694,9 +694,6 @@ if (rtc_include_tests) {
public_configs = [ ":common_inherited_config" ]
sources = [
"base/nullsocketserver_unittest.cc",
- "base/physicalsocketserver_unittest.cc",
- "base/socket_unittest.cc",
- "base/socket_unittest.h",
"base/socketaddress_unittest.cc",
"base/virtualsocket_unittest.cc",
]
@@ -706,16 +703,17 @@ if (rtc_include_tests) {
"//testing/gtest",
]
if (is_win) {
- sources += [ "base/win32socketserver_unittest.cc" ]
-
# TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot then reenable
# these tests.
+ # sources += [ "base/win32socketserver_unittest.cc" ]
kjellander_webrtc 2016/08/01 19:37:31 This is odd, it was really added+removed before...
+ }
+ if (!is_win) {
kjellander_webrtc 2016/08/01 19:37:31 Replace line 709-710 with: } else {
danilchap 2016/08/02 07:49:37 Done.
# TODO(pbos): Move test disabling to ifdefs within the test files instead
# of here.
- sources -= [
+ sources += [
"base/physicalsocketserver_unittest.cc",
"base/socket_unittest.cc",
- "base/win32socketserver_unittest.cc",
+ "base/socket_unittest.h",
]
}
if (is_android) {
« no previous file with comments | « no previous file | webrtc/webrtc_tests.gypi » ('j') | webrtc/webrtc_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698