Get tests working on systems that only support IPv6.

webrtc/base/testclient_unittest.cc

 /*
  *  Copyright 2006 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/testclient.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/ptr_util.h"
 #include "webrtc/base/testechoserver.h"
 #include "webrtc/base/thread.h"
 
 using namespace rtc;
 
+#define MAYBE_SKIP_IPV4                    \
+  if (!HasIPv4Enabled()) {                 \
+    LOG(LS_INFO) << "No IPv4... skipping"; \
+    return;                                \
+  }
+
+#define MAYBE_SKIP_IPV6                    \
+  if (!HasIPv6Enabled()) {                 \
+    LOG(LS_INFO) << "No IPv6... skipping"; \
+    return;                                \
+  }
+
 void TestUdpInternal(const SocketAddress& loopback) {
   Thread *main = Thread::Current();
   AsyncSocket* socket = main->socketserver()
       ->CreateAsyncSocket(loopback.family(), SOCK_DGRAM);
   socket->Bind(loopback);
 
   TestClient client(MakeUnique<AsyncUDPSocket>(socket));
   SocketAddress addr = client.address(), from;
   EXPECT_EQ(3, client.SendTo("foo", 3, addr));
   EXPECT_TRUE(client.CheckNextPacket("foo", 3, &from));
@@ skipping 15 matching lines @@
   SocketAddress addr = client.address(), from;
   EXPECT_TRUE(client.CheckConnected());
   EXPECT_EQ(3, client.Send("foo", 3));
   EXPECT_TRUE(client.CheckNextPacket("foo", 3, &from));
   EXPECT_EQ(from, server.address());
   EXPECT_TRUE(client.CheckNoPacket());
 }
 
 // Tests whether the TestClient can send UDP to itself.
 TEST(TestClientTest, TestUdpIPv4) {
+  MAYBE_SKIP_IPV4;
   TestUdpInternal(SocketAddress("127.0.0.1", 0));
 }
 
 #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 {
-    LOG(LS_INFO) << "Skipping IPv6 test.";
-  }
+  MAYBE_SKIP_IPV6;
+  TestUdpInternal(SocketAddress("::1", 0));
 }
 
 // Tests whether the TestClient can connect to a server and exchange data.
 TEST(TestClientTest, TestTcpIPv4) {
+  MAYBE_SKIP_IPV4;
   TestTcpInternal(SocketAddress("127.0.0.1", 0));
 }
 
 #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 {
-    LOG(LS_INFO) << "Skipping IPv6 test.";
-  }
+  MAYBE_SKIP_IPV6;
+  TestTcpInternal(SocketAddress("::1", 0));
 }