commit 868e4dbc709c3e5b77af061636f653bae46dfc56
author Primiano Tucci <primiano@google.com> Thu Jul 28 19:44:44 2022 +0100
committer Primiano Tucci <primiano@google.com> Thu Jul 28 19:38:25 2022 +0000
tree e8e989c298069890dfd6270dae05192df9cba0a3
parent 98ea8945a9892080a4963135c0ff4cbd38ceda45

base: Disable Sockaddr_AbstractUnix test on Mac OS

Abstract sockets are a Linux-ism and are not supported on Mac OS.

Bug: 240573274
Change-Id: Ifee8fda9d117f32ccaae1d4541249abc0807d847

src/base/unix_socket_unittest.cc

diff --git a/src/base/unix_socket_unittest.cc b/src/base/unix_socket_unittest.cc
index dd63504..a803fa8 100644
--- a/src/base/unix_socket_unittest.cc
+++ b/src/base/unix_socket_unittest.cc
@@ -976,7 +976,7 @@
   std::string sock_path = tmp_dir.path() + "/test.sock";
   auto srv = UnixSocket::Listen(sock_path, &event_listener_, &task_runner_,
                                 SockFamily::kUnix, SockType::kStream);
-  ASSERT_TRUE(srv->is_listening());
+  ASSERT_TRUE(srv && srv->is_listening());
   ASSERT_TRUE(FileExists(sock_path));
 
   // Create a raw socket and manually connect to that (to avoid getting affected
@@ -990,14 +990,18 @@
   cli.Shutdown();
   remove(sock_path.c_str());
 }
+#endif  // OS_LINUX || OS_ANDROID || OS_MAC
 
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
 // Regression test for b/239725760.
+// Abstract sockets are not supported on Mac OS.
 TEST_F(UnixSocketTest, Sockaddr_AbstractUnix) {
   StackString<128> sock_name("@perfetto_test_%d_%d", getpid(), rand() % 100000);
   auto srv =
       UnixSocket::Listen(sock_name.ToStdString(), &event_listener_,
                          &task_runner_, SockFamily::kUnix, SockType::kStream);
-  ASSERT_TRUE(srv->is_listening());
+  ASSERT_TRUE(srv && srv->is_listening());
 
   auto cli = UnixSocketRaw::CreateMayFail(SockFamily::kUnix, SockType::kStream);
   struct sockaddr_un addr {};
@@ -1009,7 +1013,7 @@
   ASSERT_EQ(0, connect(cli.fd(), reinterpret_cast<struct sockaddr*>(&addr),
                        addr_len));
 }
-#endif  // OS_LINUX || OS_ANDROID || OS_MAC
+#endif  // OS_LINUX || OS_ANDROID
 
 }  // namespace
 }  // namespace base