fixing

.github/workflows/runTests.yml

@@ -12,23 +12,8 @@ jobs:
   unitTests:
     strategy:
       matrix:
-        name: [ubuntu-gcc, ubuntu-clang, windows-VS, macOS]
+        name: [macOS]
         include:
-            - name: ubuntu-gcc
-              os: ubuntu-latest
-              compiler_opt: "-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
-              build_system: '-G Ninja'
-              filter: ""
-            - name: ubuntu-clang
-              os: ubuntu-latest
-              compiler_opt: "-DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17"
-              build_system: '-G Ninja'
-              filter: ""
-            - name: windows-VS
-              os: windows-latest
-              compiler_opt: ""
-              build_system: ""
-              filter: "robustness"
             - name: macOS
               os: macos-latest
               compiler_opt: "-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"

src/src/SocketFunctions.cpp

@@ -19,7 +19,7 @@ namespace MinimalSocket {
 namespace {
 #ifdef _WIN32
 #define REBIND_OPTION SO_REUSEADDR
-#else
+#elif defined(__unix__) || defined(__APPLE__)
 #define REBIND_OPTION SO_REUSEPORT
 #endif
 } // namespace
@@ -158,8 +158,10 @@ int isTimeoutErrorCode(int code) {
   return
 #ifdef _WIN32
       code == WSAETIMEDOUT || code == WSAEWOULDBLOCK;
-#else
+#elif defined(__unix__)
       code == EAGAIN || code == EWOULDBLOCK;
+#elif defined(__APPLE__)
+      code == EAGAIN;
 #endif
 }
 

tests/TestTCP.cpp

@@ -287,7 +287,7 @@ TEST_CASE("Establish tcp connection non blocking", "[tcp]") {
       },
       [&](Barrier &br) {
         br.arrive_and_wait();
-        TcpClient<true> client{ Address{port, family} };
+        TcpClient<true> client{Address{port, family}};
         client.open();
         REQUIRE(client.wasOpened());
         client.send(request);
@@ -299,7 +299,7 @@ TEST_CASE("Receive non blocking (tcp)", "[tcp]") {
   const auto family = GENERATE(AddressFamily::IP_V4, AddressFamily::IP_V6);
 
   std::optional<tcp::TcpConnectionNonBlocking> server_side;
-  tcp::TcpClient<false> client_side{ Address{port, family} };
+  tcp::TcpClient<false> client_side{Address{port, family}};
   ParallelSection::biSection(
       [&](Barrier &br) {
         tcp::TcpServer<true> server{port, family};
@@ -316,13 +316,19 @@ TEST_CASE("Receive non blocking (tcp)", "[tcp]") {
   SECTION("client side non blocking receive") {
     CHECK(client_side.receive(request.size()).empty());
     server_side->send(request);
+#if defined(__APPLE__)
+    std::this_thread::sleep_for(std::chrono::seconds{3});
+#endif
     auto received_request = client_side.receive(request.size());
     CHECK(received_request == request);
   }
 
   SECTION("server side non blocking receive") {
     CHECK(server_side->receive(request.size()).empty());
     client_side.send(request);
+#if defined(__APPLE__)
+    std::this_thread::sleep_for(std::chrono::seconds{3});
+#endif
     auto received_request = server_side->receive(request.size());
     CHECK(received_request == request);
   }

tests/TestUDP.cpp

@@ -364,6 +364,9 @@ TEST_CASE("Receive from unknown non blocking", "[udp]") {
 
   CHECK_FALSE(responder->receive(request.size()).has_value());
   requester->sendTo(request, responder_address);
+#if defined(__APPLE__)
+  std::this_thread::sleep_for(std::chrono::seconds{3});
+#endif
   auto received_request = responder->receive(request.size());
   REQUIRE(received_request.has_value());
   CHECK(received_request->received_message == request);
@@ -378,6 +381,9 @@ TEST_CASE("Receive non blocking (udp)", "[udp]") {
 
   CHECK(responder->receive(request.size()).empty());
   requester->send(request);
+#if defined(__APPLE__)
+  std::this_thread::sleep_for(std::chrono::seconds{3});
+#endif
   auto received_request = responder->receive(request.size());
   CHECK(received_request == request);
 }