Index: webrtc/base/physicalsocketserver_unittest.cc |
diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc |
index 3b7ed7bff2cc5e1495bf0b914c933a86030398cf..c2b71e0745d6416500fa15d16a481263509b0074 100644 |
--- a/webrtc/base/physicalsocketserver_unittest.cc |
+++ b/webrtc/base/physicalsocketserver_unittest.cc |
@@ -29,7 +29,13 @@ TEST_F(PhysicalSocketTest, TestConnectIPv4) { |
SocketTest::TestConnectIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestConnectIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestConnectIPv6 DISABLED_TestConnectIPv6 |
+#else |
+#define MAYBE_TestConnectIPv6 TestConnectIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestConnectIPv6) { |
SocketTest::TestConnectIPv6(); |
} |
@@ -45,7 +51,13 @@ TEST_F(PhysicalSocketTest, TestConnectFailIPv4) { |
SocketTest::TestConnectFailIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestConnectFailIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestConnectFailIPv6 DISABLED_TestConnectFailIPv6 |
+#else |
+#define MAYBE_TestConnectFailIPv6 TestConnectFailIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestConnectFailIPv6) { |
SocketTest::TestConnectFailIPv6(); |
} |
@@ -53,8 +65,15 @@ TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupFailIPv4) { |
SocketTest::TestConnectWithDnsLookupFailIPv4(); |
} |
- |
-TEST_F(PhysicalSocketTest, TestConnectWithDnsLookupFailIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestConnectWithDnsLookupFailIPv6 \ |
+ DISABLED_TestConnectWithDnsLookupFailIPv6 |
+#else |
+#define MAYBE_TestConnectWithDnsLookupFailIPv6 \ |
+ TestConnectWithDnsLookupFailIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestConnectWithDnsLookupFailIPv6) { |
SocketTest::TestConnectWithDnsLookupFailIPv6(); |
} |
@@ -63,7 +82,14 @@ TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv4) { |
SocketTest::TestConnectWithClosedSocketIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestConnectWithClosedSocketIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestConnectWithClosedSocketIPv6 \ |
+ DISABLED_TestConnectWithClosedSocketIPv6 |
+#else |
+#define MAYBE_TestConnectWithClosedSocketIPv6 TestConnectWithClosedSocketIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestConnectWithClosedSocketIPv6) { |
SocketTest::TestConnectWithClosedSocketIPv6(); |
} |
@@ -71,7 +97,14 @@ TEST_F(PhysicalSocketTest, TestConnectWhileNotClosedIPv4) { |
SocketTest::TestConnectWhileNotClosedIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestConnectWhileNotClosedIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestConnectWhileNotClosedIPv6 \ |
+ DISABLED_TestConnectWhileNotClosedIPv6 |
+#else |
+#define MAYBE_TestConnectWhileNotClosedIPv6 TestConnectWhileNotClosedIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestConnectWhileNotClosedIPv6) { |
SocketTest::TestConnectWhileNotClosedIPv6(); |
} |
@@ -79,7 +112,14 @@ TEST_F(PhysicalSocketTest, TestServerCloseDuringConnectIPv4) { |
SocketTest::TestServerCloseDuringConnectIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestServerCloseDuringConnectIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestServerCloseDuringConnectIPv6 \ |
+ DISABLED_TestServerCloseDuringConnectIPv6 |
+#else |
+#define MAYBE_TestServerCloseDuringConnectIPv6 TestServerCloseDuringConnectIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestServerCloseDuringConnectIPv6) { |
SocketTest::TestServerCloseDuringConnectIPv6(); |
} |
@@ -87,7 +127,14 @@ TEST_F(PhysicalSocketTest, TestClientCloseDuringConnectIPv4) { |
SocketTest::TestClientCloseDuringConnectIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestClientCloseDuringConnectIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestClientCloseDuringConnectIPv6 \ |
+ DISABLED_TestClientCloseDuringConnectIPv6 |
+#else |
+#define MAYBE_TestClientCloseDuringConnectIPv6 TestClientCloseDuringConnectIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestClientCloseDuringConnectIPv6) { |
SocketTest::TestClientCloseDuringConnectIPv6(); |
} |
@@ -95,7 +142,13 @@ TEST_F(PhysicalSocketTest, TestServerCloseIPv4) { |
SocketTest::TestServerCloseIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestServerCloseIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestServerCloseIPv6 DISABLED_TestServerCloseIPv6 |
+#else |
+#define MAYBE_TestServerCloseIPv6 TestServerCloseIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestServerCloseIPv6) { |
SocketTest::TestServerCloseIPv6(); |
} |
@@ -103,7 +156,14 @@ TEST_F(PhysicalSocketTest, TestCloseInClosedCallbackIPv4) { |
SocketTest::TestCloseInClosedCallbackIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestCloseInClosedCallbackIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestCloseInClosedCallbackIPv6 \ |
+ DISABLED_TestCloseInClosedCallbackIPv6 |
+#else |
+#define MAYBE_TestCloseInClosedCallbackIPv6 TestCloseInClosedCallbackIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestCloseInClosedCallbackIPv6) { |
SocketTest::TestCloseInClosedCallbackIPv6(); |
} |
@@ -111,7 +171,13 @@ TEST_F(PhysicalSocketTest, TestSocketServerWaitIPv4) { |
SocketTest::TestSocketServerWaitIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestSocketServerWaitIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestSocketServerWaitIPv6 DISABLED_TestSocketServerWaitIPv6 |
+#else |
+#define MAYBE_TestSocketServerWaitIPv6 TestSocketServerWaitIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestSocketServerWaitIPv6) { |
SocketTest::TestSocketServerWaitIPv6(); |
} |
@@ -119,7 +185,13 @@ TEST_F(PhysicalSocketTest, TestTcpIPv4) { |
SocketTest::TestTcpIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestTcpIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestTcpIPv6 DISABLED_TestTcpIPv6 |
+#else |
+#define MAYBE_TestTcpIPv6 TestTcpIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestTcpIPv6) { |
SocketTest::TestTcpIPv6(); |
} |
@@ -127,7 +199,13 @@ TEST_F(PhysicalSocketTest, TestUdpIPv4) { |
SocketTest::TestUdpIPv4(); |
} |
-TEST_F(PhysicalSocketTest, TestUdpIPv6) { |
+// Crashes on Linux. See webrtc:4923. |
+#if defined(WEBRTC_LINUX) |
+#define MAYBE_TestUdpIPv6 DISABLED_TestUdpIPv6 |
+#else |
+#define MAYBE_TestUdpIPv6 TestUdpIPv6 |
+#endif |
+TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) { |
SocketTest::TestUdpIPv6(); |
} |