Create a 'webrtc_nonparallel_tests' target.

webrtc/webrtc_tests.gypi

Index: webrtc/webrtc_tests.gypi
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 0e245c5426f3e3c97023acbe0fc7298218376c29..aca6dd0b31a3ad3cc267c7339b2e989c62852bbb 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,55 @@
         }],
       ],
     },
+    {
+      '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.
+            'base/physicalsocketserver_unittest.cc',

[kjellander_webrtc, 2015/10/28 15:53:42]

I don't remember if there's anything stopping us from getting rid of these
include+exclude conditions.

Can you make it so the right sources are added for OS!="win", so they don't have
to be listed in the all-platforms sources listing above?

[pbos-webrtc, 2015/10/29 09:46:33]

This one (!= win) is currently only here to disable tests for Windows, that's
why win32socketserver_unittest.cc is both added and removed in the same
condition block.

I think the tests should be disabled within ifdefs in the file itself, but can I
punt that? I put a TODO here.

[kjellander_webrtc, 2015/10/29 11:30:16]

What I meant is that these files could be removed from the all-platforms source
block above and have this sources! block changed to a sources block put under a
OS!="win" condition instead.
Then each file would only be listed once. But it's fine to do that in another CL
(since there are many more places it can be done).

+            '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 +307,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"', {