Merge branch 'master' into bracz-hub-test-app

* master: Fix test flakiness. Fix compile error on FdUtils under freertos.
bakerstu · Jan 26, 2024 · 91b9680 · 91b9680
2 parents 5786c59 + ad0681b
commit 91b9680
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/openlcb/HubLatency.cxxtest b/src/openlcb/HubLatency.cxxtest
@@ -216,6 +216,7 @@ protected:
         LOG(INFO, "set up test case");
         stack1_.start_executor_thread("stack1", 0, 0);
         stack1_.start_tcp_hub_server(50989);
+        wait_for_main_executor();
         int fd = ConnectSocket("localhost", 50989);
         HASSERT(fd >= 0);
         create_gc_port_for_can_hub(&canHub2_, fd);

diff --git a/src/utils/FdUtils.cxx b/src/utils/FdUtils.cxx
@@ -34,10 +34,12 @@
 
 #include "FdUtils.hxx"
 
+#ifdef __linux__
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/stat.h>
 #include <termios.h> /* tc* functions */
+#endif
 
 #include "nmranet_config.h"