| Index: webrtc/webrtc_tests.gypi
|
| diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
|
| index 0e245c5426f3e3c97023acbe0fc7298218376c29..547b99b6939404a545a4ad234078c25f02b9b568 100644
|
| --- a/webrtc/webrtc_tests.gypi
|
| +++ b/webrtc/webrtc_tests.gypi
|
| @@ -42,6 +42,7 @@
|
| 'video_loopback',
|
| 'video_replay',
|
| 'webrtc_perf_tests',
|
| + 'webrtc_nonparallel_tests',
|
| ],
|
| },
|
| {
|
| @@ -232,6 +233,57 @@
|
| }],
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'webrtc_nonparallel_tests',
|
| + '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',
|
| + ],
|
| + 'defines': [
|
| + 'GTEST_RELATIVE_PATH',
|
| + ],
|
| + 'dependencies': [
|
| + '<(DEPTH)/testing/gtest.gyp:gtest',
|
| + 'base/base.gyp:rtc_base',
|
| + 'test/test.gyp:test_main',
|
| + ],
|
| + 'conditions': [
|
| + ['OS=="android"', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
|
| + ],
|
| + }],
|
| + ['OS=="win"', {
|
| + 'sources': [
|
| + '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.
|
| + 'base/physicalsocketserver_unittest.cc',
|
| + 'base/socket_unittest.cc',
|
| + 'base/win32socketserver_unittest.cc',
|
| + ],
|
| + }],
|
| + ['OS=="mac"', {
|
| + 'sources': [
|
| + 'base/macsocketserver_unittest.cc',
|
| + ],
|
| + }],
|
| + ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
|
| + 'defines': [
|
| + 'CARBON_DEPRECATED=YES',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| ],
|
| 'conditions': [
|
| ['OS=="android"', {
|
| @@ -257,6 +309,13 @@
|
| '<(apk_tests_path):webrtc_perf_tests_apk',
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'webrtc_nonparallel_tests_apk_target',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '<(apk_tests_path):webrtc_nonparallel_tests_apk',
|
| + ],
|
| + },
|
| ],
|
| }],
|
| ['test_isolation_mode != "noop"', {
|
|
|