TESTS: Avoid requiring ipv6 in some of the standard tests

smithdh · Jan 31, 2025 · 4530de7 · 4530de7
1 parent dbf7e44
commit 4530de7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/tests/XrdCl/XrdClSocket.cc b/tests/XrdCl/XrdClSocket.cc
@@ -230,7 +230,7 @@ TEST(SocketTest, TransferTest)
   EXPECT_TRUE( serv.Start() );
 
   EXPECT_EQ( sock.GetStatus(), Socket::Disconnected );
-  EXPECT_XRDST_OK( sock.Initialize( AF_INET6 ) );
+  EXPECT_XRDST_OK( sock.Initialize( AF_INET ) );
   EXPECT_XRDST_OK( sock.Connect( "localhost", port ) );
   EXPECT_EQ( sock.GetStatus(), Socket::Connected );
 

diff --git a/tests/common/Server.cc b/tests/common/Server.cc
@@ -147,8 +147,17 @@ bool Server::Setup( int port, int accept, ClientHandlerFactory *factory )
   pListenSocket = socket( protocolFamily, SOCK_STREAM, 0 );
   if( pListenSocket < 0 )
   {
-    log->Error( 1, "Unable to create listening socket: %s", strerror( errno ) );
-    return false;
+    if ( errno == EAFNOSUPPORT && pProtocolFamily == Both )
+    {
+      protocolFamily = AF_INET;
+      pProtocolFamily = Inet4;
+      pListenSocket = socket( protocolFamily, SOCK_STREAM, 0 );
+    }
+    if ( pListenSocket < 0 )
+    {
+      log->Error( 1, "Unable to create listening socket: %s", strerror( errno ) );
+      return false;
+    }
   }
 
   int optVal = 1;
@@ -159,9 +168,9 @@ bool Server::Setup( int port, int accept, ClientHandlerFactory *factory )
     return false;
   }
 
-  if( pProtocolFamily == Both )
+  if( protocolFamily == AF_INET6 )
   {
-    optVal = 0;
+    optVal = (pProtocolFamily == Both) ? 0 : 1;
     if( setsockopt( pListenSocket, IPPROTO_IPV6, IPV6_V6ONLY, &optVal,
                     sizeof(optVal) ) == -1 )
     {