From 62a501066f66ad98aef2cbb662db1a2fd0d18a6a Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 18 May 2015 18:19:43 +0100 Subject: [PATCH] Disabled IPC logging tests for Mac and Linux #4624 This is a bit hacky, but IPC logging isn't used on Mac and Linux anyway, and we're hopefully going to remove it. --- src/test/unittests/ipc/IpcLogOutputterTests.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/unittests/ipc/IpcLogOutputterTests.cpp b/src/test/unittests/ipc/IpcLogOutputterTests.cpp index caaedd58..e265c8a2 100644 --- a/src/test/unittests/ipc/IpcLogOutputterTests.cpp +++ b/src/test/unittests/ipc/IpcLogOutputterTests.cpp @@ -15,9 +15,6 @@ * along with this program. If not, see . */ -// TODO: fix, tests failing intermittently on mac. -#ifndef WINAPI_CARBON - #define TEST_ENV #include "test/mock/ipc/MockIpcServer.h" @@ -25,10 +22,14 @@ #include "mt/Thread.h" #include "ipc/IpcLogOutputter.h" #include "base/String.h" +#include "common/common.h" #include "test/global/gmock.h" #include "test/global/gtest.h" +// HACK: ipc logging only used on windows anyway +#if WINAPI_MSWINDOWS + using ::testing::_; using ::testing::Return; using ::testing::Matcher; @@ -90,4 +91,4 @@ TEST(IpcLogOutputterTests, write_bufferRateLimit) outputter.waitForEmpty(); } -#endif // WINAPI_CARBON +#endif // WINAPI_MSWINDOWS