admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove negative include rules from webrtc_nonparallel_tests target

Browse Source 
R=kjellander@webrtc.org
BUG=webrtc:6040

Review-Url: https://codereview.webrtc.org/2200623003
Cr-Commit-Position: refs/heads/master@{#13603}
This commit is contained in:
danilchap 2016-08-02 02:30:01 -07:00 committed by Commit bot
parent 606daa8b5e
commit b4ad456ba0
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/BUILD.gn
View File

@ -695,9 +695,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",
]
@ -707,16 +704,16 @@ 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" ]
} else {
# 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) {

18
webrtc/webrtc_tests.gypi
View File

@ -471,9 +471,6 @@
'type': '<(gtest_target_type)',
'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',
],
@ -493,16 +490,17 @@
}],
['OS=="win"', {
'sources': [
'base/win32socketserver_unittest.cc',
# TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
# then reenable these tests.
# 'base/win32socketserver_unittest.cc',
],
'sources!': [
# TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
# then reenable these tests.
# TODO(pbos): Move test disabling to ifdefs within the test files
# instead of here.
}, {
# TODO(pbos): Move test disabling to ifdefs within the test files
# instead of here.
'sources': [
'base/physicalsocketserver_unittest.cc',
'base/socket_unittest.cc',
'base/win32socketserver_unittest.cc',
'base/socket_unittest.h',
],
}],
['OS=="mac"', {