From 48328db339b5eff70a631f067fb3010b30cb4d3a Mon Sep 17 00:00:00 2001
From: Steve Linden <steve@lindenlab.com>
Date: Thu, 10 Sep 2009 15:36:49 -0700
Subject: [PATCH] #ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear
to be needed and breaks the build.
---
indra/test/test.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index c9e985c914b..e7ba8e33b8c 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,8 +54,10 @@
# include "ctype_workaround.h"
#endif
+#ifndef LL_WINDOWS
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#endif
namespace tut
{
@@ -243,7 +245,9 @@ int main(int argc, char **argv)
{
// The following line must be executed to initialize Google Mock
// (and Google Test) before running the tests.
+#ifndef LL_WINDOWS
::testing::InitGoogleMock(&argc, argv);
+#endif
LLError::initForApplication(".");
LLError::setFatalFunction(wouldHaveCrashed);
LLError::setDefaultLevel(LLError::LEVEL_ERROR);
--
GitLab