diff options
author | minyue <minyue@webrtc.org> | 2015-08-19 04:42:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 11:42:07 +0000 |
commit | 5d69648782de066a55e4b1ff8dc77e146cc354ef (patch) | |
tree | b65ba8f3e653c237a077ed8f258ec0c5084591eb | |
parent | 048e80cacab128280c37c3e0574873cde8544410 (diff) | |
download | webrtc-5d69648782de066a55e4b1ff8dc77e146cc354ef.tar.gz |
Disabling TestUdpIPv6 on Linux
BUG=webrtc:4923, 522036
NOTRY=true
Review URL: https://codereview.webrtc.org/1298363002
Cr-Commit-Position: refs/heads/master@{#9734}
-rw-r--r-- | webrtc/base/network_unittest.cc | 8 | ||||
-rw-r--r-- | webrtc/base/physicalsocketserver_unittest.cc | 104 | ||||
-rw-r--r-- | webrtc/base/testclient_unittest.cc | 14 |
3 files changed, 110 insertions, 16 deletions
diff --git a/webrtc/base/network_unittest.cc b/webrtc/base/network_unittest.cc index fdf75caf37..bac57794f9 100644 --- a/webrtc/base/network_unittest.cc +++ b/webrtc/base/network_unittest.cc @@ -558,7 +558,13 @@ TEST_F(NetworkTest, TestDumpNetworks) { } // Test that we can toggle IPv6 on and off. -TEST_F(NetworkTest, TestIPv6Toggle) { +// Crashes on Linux. See webrtc:4923. +#if defined(WEBRTC_LINUX) +#define MAYBE_TestIPv6Toggle DISABLED_TestIPv6Toggle +#else +#define MAYBE_TestIPv6Toggle TestIPv6Toggle +#endif +TEST_F(NetworkTest, MAYBE_TestIPv6Toggle) { BasicNetworkManager manager; bool ipv6_found = false; NetworkManager::NetworkList list; diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc index 3b7ed7bff2..c2b71e0745 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(); } diff --git a/webrtc/base/testclient_unittest.cc b/webrtc/base/testclient_unittest.cc index 1cb9a1a099..17bf4e6c46 100644 --- a/webrtc/base/testclient_unittest.cc +++ b/webrtc/base/testclient_unittest.cc @@ -56,7 +56,12 @@ TEST(TestClientTest, TestUdpIPv4) { TestUdpInternal(SocketAddress("127.0.0.1", 0)); } -TEST(TestClientTest, TestUdpIPv6) { +#if defined(WEBRTC_LINUX) +#define MAYBE_TestUdpIPv6 DISABLED_TestUdpIPv6 +#else +#define MAYBE_TestUdpIPv6 TestUdpIPv6 +#endif +TEST(TestClientTest, MAYBE_TestUdpIPv6) { if (HasIPv6Enabled()) { TestUdpInternal(SocketAddress("::1", 0)); } else { @@ -69,7 +74,12 @@ TEST(TestClientTest, TestTcpIPv4) { TestTcpInternal(SocketAddress("127.0.0.1", 0)); } -TEST(TestClientTest, TestTcpIPv6) { +#if defined(WEBRTC_LINUX) +#define MAYBE_TestTcpIPv6 DISABLED_TestTcpIPv6 +#else +#define MAYBE_TestTcpIPv6 TestTcpIPv6 +#endif +TEST(TestClientTest, MAYBE_TestTcpIPv6) { if (HasIPv6Enabled()) { TestTcpInternal(SocketAddress("::1", 0)); } else { |