commit b03ba36a7ed038f2c547b79eb839d738a437143e
author Primiano Tucci <primiano@google.com> Wed Dec 06 09:47:41 2017 +0000
committer Primiano Tucci <primiano@google.com> Wed Dec 06 09:47:41 2017 +0000
tree d236a6752c0030ed8f2b52204d9e40748977a4ad
parent 4f9b6d7b7b2ad7b86e1577a18dc6e2df91b98164

Unify test targets under perfetto_{tests,benchmarks}

To avoid collisions in chrome on binary names like base_unittests.
Also drop the ipc_test.cc which was a half demo and not really a
test. The full code and real tests will come in the next weeks.

Bug: 68710794
Change-Id: Ib472cc344e0a3316dfbad90108c9638647409809

src/ipc/unix_socket_unittest.cc

diff --git a/src/ipc/unix_socket_unittest.cc b/src/ipc/unix_socket_unittest.cc
index e5586a8..ed7d664 100644
--- a/src/ipc/unix_socket_unittest.cc
+++ b/src/ipc/unix_socket_unittest.cc
@@ -26,6 +26,7 @@
 #include "perfetto/base/logging.h"
 #include "perfetto/base/utils.h"
 #include "src/base/test/test_task_runner.h"
+#include "src/ipc/test/test_socket.h"
 
 namespace perfetto {
 namespace ipc {
@@ -35,16 +36,7 @@
 using ::testing::Invoke;
 using ::testing::Mock;
 
-// Mac OS X doesn't support abstract (i.e. unnamed) sockets.
-#if BUILDFLAG(OS_MACOSX)
-static const char kSocketName[] = "/tmp/test_socket";
-void UnlinkSocket() {
-  unlink(kSocketName);
-}
-#else
-static const char kSocketName[] = "@test_socket";
-void UnlinkSocket() {}
-#endif
+static const char kSocketName[] = TEST_SOCK_NAME("unix_socket_unittest");
 
 class MockEventListener : public UnixSocket::EventListener {
  public:
@@ -75,8 +67,8 @@
 
 class UnixSocketTest : public ::testing::Test {
  protected:
-  void SetUp() override { UnlinkSocket(); }
-  void TearDown() override { UnlinkSocket(); }
+  void SetUp() override { DESTROY_TEST_SOCK(kSocketName); }
+  void TearDown() override { DESTROY_TEST_SOCK(kSocketName); }
 
   base::TestTaskRunner task_runner_;
   MockEventListener event_listener_;