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.
This commit is contained in:
Nick Bolton 2015-05-18 18:19:43 +01:00
parent 9f577ca4f3
commit 62a501066f

View File

@ -15,9 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
// TODO: fix, tests failing intermittently on mac.
#ifndef WINAPI_CARBON
#define TEST_ENV #define TEST_ENV
#include "test/mock/ipc/MockIpcServer.h" #include "test/mock/ipc/MockIpcServer.h"
@ -25,10 +22,14 @@
#include "mt/Thread.h" #include "mt/Thread.h"
#include "ipc/IpcLogOutputter.h" #include "ipc/IpcLogOutputter.h"
#include "base/String.h" #include "base/String.h"
#include "common/common.h"
#include "test/global/gmock.h" #include "test/global/gmock.h"
#include "test/global/gtest.h" #include "test/global/gtest.h"
// HACK: ipc logging only used on windows anyway
#if WINAPI_MSWINDOWS
using ::testing::_; using ::testing::_;
using ::testing::Return; using ::testing::Return;
using ::testing::Matcher; using ::testing::Matcher;
@ -90,4 +91,4 @@ TEST(IpcLogOutputterTests, write_bufferRateLimit)
outputter.waitForEmpty(); outputter.waitForEmpty();
} }
#endif // WINAPI_CARBON #endif // WINAPI_MSWINDOWS