From 2c4862e0f14383f362d83bfa822f1d94edd16b02 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergeant@mz.com>
Date: Sat, 9 Mar 2019 10:45:40 -0800
Subject: [PATCH] asan test suite fix

---
 test/IXTest.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/test/IXTest.cpp b/test/IXTest.cpp
index fb633916..f80447a5 100644
--- a/test/IXTest.cpp
+++ b/test/IXTest.cpp
@@ -69,13 +69,14 @@ namespace ix
         Logger() << msg;
     }
 
-    int getAnyFreePort()
+    int getAnyFreePortSimple()
     {
-        // ASAN complains about getsockname
-#if defined(__has_feature) && __has_feature(address_sanitizer)
         static int defaultPort = 8090;
         return defaultPort++;
-#else
+    }
+
+    int getAnyFreePort()
+    {
         int defaultPort = 8090;
         int sockfd;
         if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
@@ -120,15 +121,21 @@ namespace ix
         ::close(sockfd);
 
         return port;
-#endif
     }
 
     int getFreePort()
     {
         while (true)
         {
+#if defined(__has_feature)
+# if __has_feature(address_sanitizer)
+            int port = getAnyFreePortSimple();
+# else
             int port = getAnyFreePort();
-
+# endif
+#else
+            int port = getAnyFreePort();
+#endif
             //
             // Only port above 1024 can be used by non root users, but for some
             // reason I got port 7 returned with macOS when binding on port 0...