Address code review comments pt3

Author: emrekultursay

lldb/source/Host/posix/DomainSocket.cpp

@@ -194,14 +194,14 @@ std::vector<std::string> DomainSocket::GetListeningConnectionURI() const {
 
 llvm::Expected<std::unique_ptr<DomainSocket>>
 DomainSocket::FromBoundNativeSocket(NativeSocket sockfd, bool should_close) {
-#ifdef __linux__
   // Check if fd represents domain socket or abstract socket.
   struct sockaddr_un addr;
   socklen_t addr_len = sizeof(addr);
   if (getsockname(sockfd, (struct sockaddr *)&addr, &addr_len) == -1)
     return llvm::createStringError("not a socket or error occurred");
   if (addr.sun_family != AF_UNIX)
     return llvm::createStringError("Bad socket type");
+#ifdef __linux__
   if (addr_len > offsetof(struct sockaddr_un, sun_path) &&
       addr.sun_path[0] == '\0')
     return std::make_unique<AbstractSocket>(sockfd, should_close);

lldb/tools/lldb-server/lldb-platform.cpp

@@ -472,7 +472,8 @@ int main_platform(int argc, char *argv[]) {
       llvm::Expected<std::unique_ptr<DomainSocket>> domain_socket =
           DomainSocket::FromBoundNativeSocket(sockfd, /*should_close=*/true);
       if (!domain_socket) {
-        LLDB_LOGF(log, "Failed to create socket: %s\n", error.AsCString());
+        LLDB_LOG_ERROR(log, domain_socket.takeError(),
+                       "Failed to create socket: {0}");
         return socket_error;
       }
       socket = std::move(domain_socket.get());

lldb/unittests/Host/SocketTest.cpp

@@ -340,9 +340,7 @@ TEST_F(SocketTest, DomainGetConnectURI) {
 
   EXPECT_EQ(socket_b_up->GetRemoteConnectionURI(), "");
 }
-#endif
 
-#if LLDB_ENABLE_POSIX
 TEST_F(SocketTest, DomainSocketFromBoundNativeSocket) {
   // Generate a name for the domain socket.
   llvm::SmallString<64> name;
@@ -353,11 +351,12 @@ TEST_F(SocketTest, DomainSocketFromBoundNativeSocket) {
 
   DomainSocket socket(true);
   Status error = socket.Listen(name, /*backlog=*/10);
-  ASSERT_FALSE(error.ToError());
+  ASSERT_THAT_ERROR(error.takeError(), llvm::Succeeded());
   NativeSocket native_socket = socket.GetNativeSocket();
 
   llvm::Expected<std::unique_ptr<DomainSocket>> sock =
-      DomainSocket::FromBoundNativeSocket(native_socket, /*should_close=*/true);
+      DomainSocket::FromBoundNativeSocket(native_socket,
+                                          /*should_close=*/false);
   ASSERT_THAT_EXPECTED(sock, llvm::Succeeded());
   ASSERT_EQ(Socket::ProtocolUnixDomain, sock->get()->GetSocketProtocol());
 }
@@ -366,19 +365,19 @@ TEST_F(SocketTest, DomainSocketFromBoundNativeSocket) {
 #if __linux__
 TEST_F(SocketTest, AbstractSocketFromBoundNativeSocket) {
   // Generate a name for the abstract socket.
-  llvm::SmallString<64> name;
-  std::error_code EC = llvm::sys::fs::createUniqueDirectory(
-      "AbstractSocketFromBoundNativeSocket", name);
-  ASSERT_FALSE(EC);
+  llvm::SmallString<100> name;
+  llvm::sys::fs::createUniquePath("AbstractSocketFromBoundNativeSocket", name,
+                                  true);
   llvm::sys::path::append(name, "test");
 
   AbstractSocket socket;
   Status error = socket.Listen(name, /*backlog=*/10);
-  ASSERT_FALSE(error.ToError());
+  ASSERT_THAT_ERROR(error.takeError(), llvm::Succeeded());
   NativeSocket native_socket = socket.GetNativeSocket();
 
   llvm::Expected<std::unique_ptr<DomainSocket>> sock =
-      DomainSocket::FromBoundNativeSocket(native_socket, /*should_close=*/true);
+      DomainSocket::FromBoundNativeSocket(native_socket,
+                                          /*should_close=*/false);
   ASSERT_THAT_EXPECTED(sock, llvm::Succeeded());
   ASSERT_EQ(Socket::ProtocolUnixAbstract, sock->get()->GetSocketProtocol());
 }